harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,211 Commits 6 Branches 36 Tags
4b5922f65291f33657cb76b6689d3613d664cd5f
Commit Graph

1887 Commits

Author SHA1 Message Date
Mario Vavti
339c9cceec check if we deal with an array before sizeof() 2018-12-19 10:05:18 +01:00
Mario Vavti
bc6d384ca9 make mod channel deal with b64 encoded mid\s 
;
 2018-12-18 10:43:06 +01:00
Mario Vavti
63b205c601 Merge remote-tracking branch 'mike/master' into dev 2018-12-18 09:59:34 +01:00
zotlabs
15ce8bc79b Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-12-17 18:45:42 -08:00
zotlabs
a33ed05bec fix default values for affinity tool and other information which could be lost when approving a connection without the entire form provided by connedit. 2018-12-17 11:32:59 -08: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
Max Kostikov
4d8a815932 Keep remote site headers for caching 2018-12-17 09:34:30 +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
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
DM42.Net (Matt Dent)
5bcc379530 Add return if no local_channel() 2018-12-15 19:49:59 -05: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
919ea9f750 fix wiki preview issue with hyperlinks 2018-12-15 18:19:29 +01: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
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 Vavti
c771d2809f Merge remote-tracking branch 'mike/master' into dev 2018-12-14 10:28:55 +01:00
zotlabs
fc78206049 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-12-13 16:13:13 -08:00
zotlabs
6464099364 regression: the ability to order apps messed up since adding pinned apps to the ordering 2018-12-12 19:11:30 -08:00
M. Dent
4cb4f17500 Merge branch 'photo-hook' into 'dev' 
add photo_view_filter hook and fix minor issue with unset auto_save_draft…

See merge request hubzilla/core!1425
 2018-12-10 21:49:12 +01:00
Mario Vavti
15a689c6f5 Merge remote-tracking branch 'mike/master' into dev 2018-12-10 10:38:06 +01:00
Mario Vavti
7894fed741 add photo_view_filter hook and fix minor issue with unset auto_save_draft variable which resultet in a javascript error 2018-12-10 10:37:29 +01:00
zotlabs
30efeb5bec home notifications won't expand if there are more than 300 unseen network notifications ahead of them. 2018-12-09 20:24:04 -08:00
zotlabs
214b81e491 rmagic discovery for z6 networks 2018-12-09 16:37:15 -08:00
zotlabs
e60fb17524 total_identities restriction off by one 2018-12-09 11:20:57 -08:00
Mario Vavti
7f65d82a74 Merge remote-tracking branch 'mike/master' into dev 2018-12-06 12:50:23 +01:00
zotlabs
8ab1f31058 reset page title if article has no title. 2018-12-05 16:24:30 -08:00
Mario Vavti
5d9f993352 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-12-04 11:39:14 +01:00
Mario
eaa52c19a8 Merge branch 'photocache' into 'dev' 
Less dependence on cache logic

See merge request hubzilla/core!1417
 2018-12-04 11:38:58 +01:00
zotlabs
42aeb19562 partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 version will be stored under $item['obj']['asld'] 2018-12-03 20:09:57 -08:00
zotlabs
ffc3dba682 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-12-03 19:19:31 -08:00
zotlabs
7a693500c4 fix generated plink 2018-12-03 14:21:33 -08:00
Max Kostikov
1c44912aff Update Photo.php 2018-12-03 21:33:32 +01:00
Max Kostikov
b586fcebab Update Photo.php 2018-12-03 21:21:23 +01:00
Max Kostikov
244c0d828a Update Photo.php 2018-12-03 13:29:27 +01:00
Max Kostikov
57ebd7e170 New logic for less dependence on cache logic 2018-12-03 13:10:55 +01:00
M. Dent
0b38ab259c Merge branch 'photocache' into 'dev' 
Add Photo Cache addon support

See merge request hubzilla/core!1412
 2018-12-02 19:33:54 +01:00
Mario Vavti
fdb0459288 Merge remote-tracking branch 'mike/master' into dev 2018-12-01 21:43:54 +01:00
zotlabs
c6acb6191c allow notification filtering by name or addr 2018-11-30 19:03:14 -08:00
Max Kostikov
f3831fa77f Better cache settings logic 2018-11-29 21:27:06 +01:00
Max Kostikov
6aa99a903f Code cleanup 2018-11-29 11:56:56 +01:00
Max Kostikov
bd0fc8a2d7 Add photo cache hooks 2018-11-29 10:38:25 +01:00
zotlabs
19e4f3c2f0 prevent incompatible export files (osada/zap) from being imported. This is to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible 2018-11-27 11:53:02 -08:00
M. Dent
6b02c664fb Do not store serialized pconfig value received via to Module/Pconfig.php 2018-11-25 10:22:09 +01:00