harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,389 Commits 6 Branches 36 Tags
develop
Commit Graph

25389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mario Vavti a086745ec0 ENT_COMPAT will only take care of double-quotes. Use double-quotes here to prevent XSS 2019-03-18 13:19:24 +01:00
Mario 51156d0582 Merge branch 'dev' into 'dev' 
misc fixes

See merge request hubzilla/core!1558
 2019-03-18 09:35:53 +01:00
Zot ea9925f489 clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible 2019-03-18 09:35:53 +01:00
zotlabs 026b96b8f2 clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible 2019-03-17 17:56:29 -07:00
zotlabs 136b2ae37f calling unserialize on array in util/service_class 2019-03-17 15:49:01 -07:00
Mike Macgirvin 97009a2748 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-18 08:55:54 +11:00
Mario e123f7c743 add phpmd and phpcs to require-dev 2019-03-17 21:42:14 +01:00
Max Kostikov e28bde6ccd Merge branch 'dreport_fixes' into 'dev' 
fix dreport redeliver

See merge request hubzilla/core!1556
 2019-03-17 12:16:20 +01:00
zotlabs a976f418e3 use php_eol for all mail header generation 2019-03-16 15:28:21 -07:00
zotlabs 3c701e780c use the php_eol constant for encoded subjects 2019-03-16 15:23:17 -07:00
Mario Vavti 769dd174bd fix dreport redeliver 2019-03-15 23:10:17 +01:00
Mario e92514ee63 Merge branch 'dev' into 'dev' 
email_header_encode() producing output that is not spec compliant

See merge request hubzilla/core!1555
 2019-03-15 19:12:51 +01:00
zotlabs 8ebc517b41 Merge branch 'dev' of ../hz into dev 2019-03-14 21:19:56 -07:00
zotlabs 91b03e52f1 email_header_encode() producing lines of illegal length because header field length was not considered in length calculation. 2019-03-14 21:18:17 -07:00
M. Dent a22406c9f8 Merge branch 'cleanup' into 'dev' 
Cleanup and fixes

See merge request hubzilla/core!1554
 2019-03-15 02:51:51 +01:00
Mario ebc3666c6f Cleanup and fixes 2019-03-15 02:51:51 +01:00
Mario Vavti f1fee1239b Merge branch 'dev' 2019-03-14 09:40:26 +01:00
Mario 8769fa0156 Merge branch 'dev' into 'dev' 
two compatibility issues zot/zot6

See merge request hubzilla/core!1553
 2019-03-14 09:38:46 +01:00
Mike Macgirvin f4d7338687 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-14 10:34:22 +11:00
zotlabs 6a8c3f82ef Merge branch 'dev' of ../hz into dev 2019-03-13 16:32:27 -07:00
zotlabs 05bcbfa28c signature issue for zot6 content imported from zotfeeds to hubzilla 2019-03-13 16:31:37 -07:00
Mike Macgirvin 6a55500c1b Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-14 10:30:01 +11:00
zotlabs a5a5ac60ba find unregistered z6 clones on hubzilla sites (does not happen automatically since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release. 2019-03-13 16:27:52 -07:00
M. Dent 6ed7f47b3f Merge branch 'core_fixes_2' into 'dev' 
add zot6 to clonable networks

See merge request hubzilla/core!1552
 2019-03-13 18:16:33 +01:00
Mario Vavti a3e94855f9 add zot6 to clonable networks 2019-03-13 17:48:00 +01:00
Mario 503da97a79 Merge branch 'dev' into 'dev' 
Dev

See merge request hubzilla/core!1551
 2019-03-13 09:40:19 +01:00
Mike Macgirvin 088a93e023 limit 1 2019-03-13 13:21:04 +11:00
Mike Macgirvin 30f71ad632 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-13 10:42:25 +11:00
Mike Macgirvin 0026849821 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-13 10:40:23 +11:00
zotlabs cf5a310286 rework authenticated item fetches (check ACL on the parent, not on the requested item) 2019-03-12 16:17:34 -07:00
zotlabs 72384ff2cb add owner permission checks to AS item fetch 2019-03-12 15:17:25 -07:00
Mario c33ef01af8 Merge branch 'dev' into 'dev' 
perform zot6 discovery in import_author_xchan

See merge request hubzilla/core!1550
 2019-03-12 13:40:04 +01:00
zotlabs 11116bdcb7 typos 2019-03-12 03:40:43 -07:00
zotlabs 09a5cf4e68 Merge branch 'dev' of ../hz into dev 2019-03-11 22:24:13 -07:00
zotlabs a9172129d2 check zot6 in import_author_xchan 2019-03-11 22:17:36 -07:00
Mike Macgirvin 3ec06705ca perform zot6 discovery in import_author_xchan 2019-03-12 16:12:29 +11:00
zotlabs 5fb0d38ad8 security updates for multiple xchans 2019-03-11 16:29:12 -07:00
Mario 9ed5cddb89 Merge branch 'dev' into 'dev' 
init_groups_visitor: include xchans from all zot-like networks

See merge request hubzilla/core!1549
 2019-03-11 09:38:27 +01:00
zotlabs 4e97fb0e58 testing init_groups_visitor changes - also add virtual groups for both zot identities 2019-03-10 22:32:37 -07:00
zotlabs 1688e373bc Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-10 15:52:07 -07:00
zotlabs cada0b6df1 init_groups_visitor: include xchans from all zot-like networks 2019-03-10 15:50:45 -07:00
Mario 91358010a0 Merge branch 'dev' into 'dev' 
non-critical: port zot_record_preferred()

See merge request hubzilla/core!1546
 2019-03-10 11:40:33 +01:00
zotlabs 51024d3821 authenticated fetch fixes 2019-03-09 12:58:03 -08:00
harukin b329d998ca Merge branch 'japanese' into 'develop' 
marge from origin 4.0

See merge request harukin/core!44
 2019-03-09 18:03:04 +09:00
harukin 482f1dba27 Merge branch 'japanese' into 'master' 
add Japanese translation

See merge request harukin/core!43
 2019-03-09 18:02:35 +09:00
harukin 23fc7e65d4 Merge branch 'origin' into 'master' 
marge from origin 4.0

See merge request harukin/core!42
 2019-03-09 17:59:08 +09:00
harukin 8f594ad6d9 Merge branch 'origin' into 'japanese' 
marge from origin 4.0

See merge request harukin/core!41
 2019-03-09 17:58:02 +09:00
harukin d8d46039a2 Merge branch 'origin' into 'develop' 
marge from origin 4.0

See merge request harukin/core!40
 2019-03-09 17:48:31 +09:00
harukin 19e1325604 edit translation 2019-03-09 17:36:26 +09:00
zotlabs 220d6ed494 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-08 14:56:13 -08:00