harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,457 Commits 6 Branches 36 Tags 152 MiB
3c2b6ce112
Commit Graph

24457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs
06c71eec65 default curl to http/1.1 
(cherry picked from commit 04a45a407e)
 2018-12-17 12:17:44 +01:00
phani00
70a7661711 remove my dark theme fixes. 2018-12-17 10:08:45 +00:00
Mario
d190b1995b Merge branch 'dev' into 'dev' 
Keep remote site headers to respect caching policy

See merge request hubzilla/core!1440
 2018-12-17 10:55:53 +01:00
Mario
a6f8230063 Merge branch 'memory-warn2' into 'dev' 
add warning if upload_filesize < 4MB.

See merge request hubzilla/core!1438
 2018-12-17 10:55:29 +01:00
DM42.Net (Matt Dent)
aabc6c2825 Add return if no local_channel() 
(cherry picked from commit 5bcc379530)
 2018-12-17 10:46:43 +01:00
DM42.Net (Matt Dent)
8323458da9 ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. 
(cherry picked from commit 3f06a857c2)
 2018-12-17 10:46:24 +01:00
Mario Vavti
e4c60d70b0 Merge remote-tracking branch 'mike/master' into dev 2018-12-17 10:12:53 +01:00
Max Kostikov
4d8a815932 Keep remote site headers for caching 2018-12-17 09:34:30 +01:00
Max Kostikov
b0e5f5973a Merge branch 'dev' into 'dev' 
Move SSLify code from Photo cache addon

See merge request hubzilla/core!1439
 2018-12-17 09:19:08 +01:00
Max Kostikov
05cb4fd897 Move SSLify code from Photo cache addon 2018-12-17 09:13:03 +01:00
Max Kostikov
72dc6ea77c Revert Photos.php code 2018-12-17 01:16:08 +01:00
Max Kostikov
1b0a6fe9eb SSLify cached URL on redirect if needed 2018-12-17 00:58:46 +01:00
Max Kostikov
363ad01bce SSLify cached URL on redirect if needed 2018-12-17 00:30:36 +01:00
zotlabs
04a45a407e default curl to http/1.1 2018-12-16 14:38:58 -08:00
phani00
14735e0a48 Update Zotlabs/Module/Setup.php 2018-12-16 22:04:28 +01:00
phani00
1c07428f89 add warning if upload_filesize < 4MB. 2018-12-16 20:35:20 +00:00
Max Kostikov
e0d68664c4 Remove photo_cache_enable variable 2018-12-16 20:48:36 +01:00
Mario
6c72c3d4a5 Merge branch 'patch-20181214a' into 'dev' 
ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.

See merge request hubzilla/core!1427
 2018-12-16 20:08:52 +01:00
harukin
9df8dbee08 Merge branch 'develop' into 'japanese' 
add harukin- picture

See merge request harukin/core!29
 2018-12-16 18:44:51 +09:00
harukin
140af45bb0 Merge branch 'add-harukin--future' into 'develop' 
add harukin- picture

See merge request harukin/core!28
 2018-12-16 18:43:41 +09:00
harukin
2bf2f2518c add harukin- picture 2018-12-16 18:35:45 +09:00
DM42.Net (Matt Dent)
5bcc379530 Add return if no local_channel() 2018-12-15 19:49:59 -05:00
M. Dent
c854ec0686 Merge branch 'dev' into 'dev' 
Update OAuth2Storage.php - fix email retrieval in getUser

See merge request hubzilla/core!1436
 2018-12-15 22:33:03 +01:00
Pascal Deklerck
6a825cc504 Update OAuth2Storage.php - fix email retrieval in getUser 2018-12-15 22:19:18 +01:00
Mario
3ed6763da9 Merge branch 'custom-item-types' into 'dev' 
Add ITEM_TYPE_CUSTOM and hooks for processing custom item types

See merge request hubzilla/core!1431
 2018-12-15 20:55:28 +01:00
Mario
dbeabb8ff0 Merge branch 'patch-20181214f' into 'dev' 
Set min/maxversion for plugins to STD_VERSION unless otherwise specified

See merge request hubzilla/core!1430
 2018-12-15 20:32:01 +01:00
Mario
cc66e1d966 Merge branch 'patch-20181214d' into 'dev' 
Make Affinity Slider (optionally) 'sticky' across page loads.

See merge request hubzilla/core!1429
 2018-12-15 20:31:06 +01:00
Mario Vavti
d7c7ff1c12 fix wiki preview issue with hyperlinks 
(cherry picked from commit 919ea9f750)
 2018-12-15 18:20:21 +01:00
Mario Vavti
919ea9f750 fix wiki preview issue with hyperlinks 2018-12-15 18:19:29 +01:00
harukin
5816ee9f9a Merge branch 'develop' into 'japanese' 
merge again upstream/master for 3.8.7

See merge request harukin/core!27
 2018-12-15 17:20:44 +09:00
harukin
bcb258bcbb Merge branch 'develop' into 'master' 
merge again upstream/master for 3.8.7

See merge request harukin/core!26
 2018-12-15 17:20:18 +09:00
harukin
e02c09d361 merge again upstream/master for 3.8.7 2018-12-15 17:17:00 +09:00
DM42.Net (Matt Dent)
09b2cdd618 Add ITEM_TYPE_CUSTOM and hooks for processing custom item types 2018-12-14 20:20:26 -05:00
Max Kostikov
1e526e68ab Merge branch 'patch-20181214b' into 'dev' 
Recreate MR#1419 for dev branch

See merge request hubzilla/core!1428
 2018-12-14 22:58:22 +01:00
Mario Vavti
d77c7d51e3 update changelog 
(cherry picked from commit 4ff3c57976)
 2018-12-14 21:47:20 +01:00
Mario Vavti
4ff3c57976 update changelog 2018-12-14 21:46:48 +01:00
Mario Vavti
d51d0160d3 fix issue with linkdropper 
(cherry picked from commit f81a3ba45d)
 2018-12-14 21:32:23 +01:00
zotlabs
c2ad9d4996 regression: the ability to order apps messed up since adding pinned apps to the ordering 
(cherry picked from commit 6464099364)
 2018-12-14 21:31:02 +01:00
DM42.Net (Matt Dent)
3416190e4b Set min/maxversion for plugins to STD_VERSION unless otherwise specified 2018-12-14 14:22:28 -05:00
DM42.Net (Matt Dent)
de7cb6d6ad Fix syntax error 2018-12-14 13:59:41 -05:00
DM42.Net (Matt Dent)
eb297104de Make Affinity Slider (optionally) 'sticky' across page loads. (default is current behavior: reset slider with each page load) 2018-12-14 12:55:49 -05:00
harukin
dfa6463e5b Merge branch 'develop' into 'japanese' 
merge from upsream

See merge request harukin/core!25
 2018-12-15 00:48:21 +09:00
harukin
9cd9776b7d Merge branch 'develop' into 'master' 
merge from upsream

See merge request harukin/core!24
 2018-12-15 00:47:46 +09:00
harukin
097afab9f4 merge from upsream 2018-12-15 00:40:38 +09:00
DM42.Net (Matt Dent)
03a214c8b9 Recreate MR#1419 for dev branch 2018-12-14 10:05:41 -05:00
DM42.Net (Matt Dent)
3f06a857c2 ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. 2018-12-14 09:55:27 -05:00
Mario
79f828125d version bump 2018-12-14 11:47:02 +01:00
Mario Vavti
ad4b18cbbe return on readImageBlob() exception 
(cherry picked from commit 993db01400)
 2018-12-14 11:31:11 +01:00
Mario Vavti
1bd49671b7 add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error 
(cherry picked from commit 7894fed741)
 2018-12-14 11:30:57 +01:00
zotlabs
9896057549 home notifications won't expand if there are more than 300 unseen network notifications ahead of them. 
(cherry picked from commit 30efeb5bec)
 2018-12-14 11:30:25 +01:00