Commit Graph

24235 Commits

Author SHA1 Message Date
zotlabs a93bd8d944 security: perms_pending not evaluated correctly
(cherry picked from commit 5a46f1229d)
2019-04-06 10:30:32 +02:00
Mario Vavti 33ac85f637 bump version 2019-03-21 11:16:35 +01:00
Mario Vavti efd9421dc9 Merge branch 'dev' 2019-03-21 11:13:54 +01:00
Mario Vavti 9b696a872b bump version 2019-03-21 11:01:57 +01:00
Mario Vavti aab515b16c optimize autoload cache and update changelog 2019-03-21 11:01:01 +01:00
Mario f220628354 Merge branch 'dev' into 'dev'
hubzilla core issue #1356 , permissions not getting decrypted on follow

See merge request hubzilla/core!1563
2019-03-21 09:46:36 +01:00
Mario Vavti 322bc5dc87 another whitespace to trigger tests 2019-03-21 09:37:23 +01:00
zotlabs 75c3bda866 hubzilla core issue #1356 , permissions not getting decrypted on follow 2019-03-20 16:09:34 -07:00
Mario Vavti b2b776169b just whitespace to trigger a new build test 2019-03-20 14:02:18 +01:00
M. Dent 8e8d7ae614 Merge branch 'video' into 'dev'
Video

See merge request hubzilla/core!1561
2019-03-20 03:17:01 +01:00
Mario fa1af5a2cb Video 2019-03-20 03:17:01 +01:00
Max Kostikov a27e4072b4 Merge branch 'update_1231' into 'dev'
mysql: remove some unused indices and add thr_parent index. pgsql: sync...

See merge request hubzilla/core!1560
2019-03-19 11:18:23 +01:00
Mario Vavti fad26a49be mysql: remove some unused indices and add thr_parent index. pgsql: sync indices with mysql indices after testing on hub.disroot.org and add thr_parent 2019-03-19 10:52:10 +01:00
Mario 1742159345 Merge branch 'dev' into 'dev'
messagefilter enhancements and fix for advisory permissions edge case

See merge request hubzilla/core!1559
2019-03-19 09:17:39 +01:00
zotlabs ed8d2cb482 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-18 20:42:58 -07:00
zotlabs 8e1f022810 share encoding issue between hz and zap 2019-03-18 20:41:59 -07:00
Mike Macgirvin 4c25072c18 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-19 13:13:21 +11:00
Mike Macgirvin 564ec32520 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-19 13:12:39 +11:00
zotlabs a743feb040 Merge branch 'dev' of ../hz into dev 2019-03-18 19:10:38 -07:00
zotlabs b028667de1 messagefilter enhancements, fix edge case in unsupported advisory privacy 2019-03-18 19:09:12 -07:00
M. Dent 41888f84bc Merge branch 'dev' into 'dev'
composer: add phpmd and phpcs to require-dev

See merge request hubzilla/core!1557
2019-03-19 00:56:29 +01:00
Mike Macgirvin 6a918dbde9 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-19 09:05:27 +11:00
Mario Vavti 578230e32c fix typos
(cherry picked from commit d486b03089)
2019-03-18 21:59:09 +01:00
Mario Vavti d486b03089 fix typos 2019-03-18 21:58:18 +01:00
Mario Vavti 8559334339 some more xss prevention
(cherry picked from commit 968c6ed8be)
2019-03-18 21:37:02 +01:00
Mario Vavti 968c6ed8be some more xss prevention 2019-03-18 21:30:25 +01:00
Mario Vavti 8893d9edc4 use urlencode
(cherry picked from commit 2ec3e4a912)
2019-03-18 13:31:25 +01:00
Mario Vavti 43753ec113 ENT_COMPAT will only take care of double-quotes. Use double-quotes here to prevent XSS
(cherry picked from commit a086745ec0)
2019-03-18 13:31:03 +01:00
Mario Vavti 2ec3e4a912 use urlencode 2019-03-18 13:29:08 +01:00
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