Commit Graph

7862 Commits

Author SHA1 Message Date
Max Kostikov 39da3459c7 Add 'reply on comment' feature
(cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2)
2019-04-29 23:43:11 +02:00
Max Kostikov 5abbfd3f19 Add initial threaded comment support 2019-04-29 23:21:17 +02:00
Max Kostikov 509067391b Update xchan profile edited date only once 2019-04-13 14:08:44 +02:00
Max Kostikov 04b261057d Set 'os_syspath' with local path 2019-04-12 22:34:32 +02:00
Max Kostikov 852343f254 Override received 'content' if we saving thumbnail in filesystem 2019-04-12 16:27:58 +02:00
Max Kostikov d3a619659f Fix 'os_syspath' if we store thumbnails in filesystem 2019-04-12 15:38:10 +02:00
Max Kostikov 5792f4bf07 Add comment on required changes in upcoming releases 2019-04-12 15:00:56 +02:00
Max Kostikov 3a0fa5cb29 Store thumbnails in filesystem or database 2019-04-12 14:59:13 +02:00
Max Kostikov 074ee656f0 Fetch thumbnails and store it in filesystem or DB; update xchan profile edit time on fetch 2019-04-12 14:56:07 +02:00
Max Kostikov 42f96dc7a6 Fix use UNIX socket file to connect DB 2019-04-10 14:13:16 +02:00
Mario e96fa64625 Merge branch 'dev' into 'dev'
Dev

See merge request hubzilla/core!1586
2019-04-10 13:25:57 +02:00
Max Kostikov 5d70d889e9 Revert "Update htconfig.sample.php"
This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12
2019-04-10 13:25:03 +02:00
zotlabs 1ed0079882 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-04-07 19:23:38 -07:00
Mario 4e12f86e90 Merge branch 'dev' into 'dev'
security: perms_pending not evaluated correctly

See merge request hubzilla/core!1583
2019-04-06 10:27:30 +02:00
zotlabs 2d886b65ce permissions cleanup 2019-04-05 18:06:59 -07:00
zotlabs 8700b87030 Merge branch 'dev' of ../hz into dev 2019-04-05 16:48:04 -07:00
zotlabs 5a46f1229d security: perms_pending not evaluated correctly 2019-04-05 16:46:52 -07:00
Mario c9f3883c8c Remove suggest channels from features 2019-04-02 15:12:32 +02:00
zotlabs cbaf0a3864 check service class limits when syncing files 2019-03-30 15:11:13 -07:00
Max Kostikov 7d392e5adb Merge branch 'z6_discover_fixes' into 'dev'
fix various issues in z6_discover() and add zot6 hubloc creation on channel import

See merge request hubzilla/core!1575
2019-03-29 15:28:28 +01:00
Mario Vavti 31680898e3 another fix for z6_discover() and create a zot6 hubloc if applicable 2019-03-28 15:51:24 +01:00
Mario Vavti b10b8ca3f4 fix various issues in z6_discover() 2019-03-27 15:20:43 +01:00
Max Kostikov b0c33308be Fix wrong bracket 2019-03-27 00:34:38 +01:00
Max Kostikov f55dfc9025 Fix wrong permissions on attached images in personal messages 2019-03-27 00:17:14 +01:00
Mario Vavti 44795b65f9 if we have an uuid deduplicate by uuid otherwise by mid 2019-03-25 11:33:01 +01:00
Mario Vavti 0a28207200 fix wrong field name 2019-03-24 21:45:23 +01:00
Mario Vavti 8ca2a5832c Revert "item_store(): deduplicate by mid OR uuid"
This reverts commit d8ce0d0df0.
2019-03-24 21:22:20 +01:00
Mario Vavti d8ce0d0df0 item_store(): deduplicate by mid OR uuid 2019-03-24 15:51:31 +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
Mario fa1af5a2cb Video 2019-03-20 03:17:01 +01: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
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
Mike Macgirvin 97009a2748 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2019-03-18 08:55:54 +11: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 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
Mario ebc3666c6f Cleanup and fixes 2019-03-15 02:51:51 +01: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
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
Mike Macgirvin 0026849821 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev 2019-03-13 10:40:23 +11: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