Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 7d392e5adb Merge branch 'z6_discover_fixes' into 'dev' Max Kostikov 2019-03-29 15:28:28 +01:00
• f44cc2b60c fix typo Mario Vavti 2019-03-28 15:56:28 +01:00
• 31680898e3 another fix for z6_discover() and create a zot6 hubloc if applicable Mario Vavti 2019-03-28 15:51:24 +01:00
• 318fd7c9e3 add backend support for connections ordering Mario Vavti 2019-03-27 20:42:56 +01:00
• b10b8ca3f4 fix various issues in z6_discover() Mario Vavti 2019-03-27 15:20:43 +01:00
• b0c33308be Fix wrong bracket Max Kostikov 2019-03-27 00:34:38 +01:00
• 1421c4e9d3 Merge branch 'dev' into 'dev' Max Kostikov 2019-03-27 00:26:26 +01:00
• f55dfc9025 Fix wrong permissions on attached images in personal messages Max Kostikov 2019-03-27 00:17:14 +01:00
• c218970890 Merge branch 'duplicate_fixes_1' into 'dev' Max Kostikov 2019-03-25 12:24:36 +01:00
• bd27ce2520 Merge branch 'patch-20190324a' into 'dev' Mario 2019-03-25 11:58:38 +01:00
• 44795b65f9 if we have an uuid deduplicate by uuid otherwise by mid Mario Vavti 2019-03-25 11:33:01 +01:00
• af84c4e6bd Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php DM42.Net (Matt Dent) 2019-03-24 22:56:18 -04:00
• 0a28207200 fix wrong field name Mario Vavti 2019-03-24 21:45:23 +01:00
• 8ca2a5832c Revert "item_store(): deduplicate by mid OR uuid" Mario Vavti 2019-03-24 21:22:20 +01:00
• 333534dfe7 Merge branch 'items_fixes' into 'dev' Max Kostikov 2019-03-24 16:45:21 +01:00
• d8ce0d0df0 item_store(): deduplicate by mid OR uuid Mario Vavti 2019-03-24 15:51:31 +01:00
• 28c3259449 Revert "item_store(): deduplicate by mid OR uuid" Mario Vavti 2019-03-24 15:49:03 +01:00
• 0d0ede7b14 item_store(): deduplicate by mid OR uuid Mario Vavti 2019-03-24 15:47:57 +01:00
• 9ebf6bcc92 Merge branch 'core_fixes' into 'dev' M. Dent 2019-03-24 03:20:24 +01:00
• 9d186e9ba3 add punify() again Mario 2019-03-23 22:53:29 +01:00
• 3c3a4526bf fix typo Mario 2019-03-23 22:49:27 +01:00
• 3094c2ce17 fix subthread on sys channel items Mario 2019-03-23 22:48:52 +01:00
• 393494a728 fix revert accidental moving of Features.php Mario 2019-03-23 22:01:46 +01:00
• d2725c3f49 aparently we do not use underscores anymore. this fixes spaming of dreports with recipient not found entries for our own xchan Mario 2019-03-23 21:50:50 +01:00
• 4d4425a5bf fix variables for xporof_locale and xprof_postcode Mario 2019-03-23 20:57:22 +01:00
• c11fbe0868 revert accidental moving of Features.php Mario 2019-03-23 20:33:43 +01:00
• c676689df0 fix 48 hours timeframe check and remove unused var in mod changeaddr Mario 2019-03-23 20:32:15 +01:00
• 0f5625d721 revert accidental moving of Enotify.php Mario 2019-03-23 20:22:11 +01:00
• 6f5e6bd0f1 fix typo Mario 2019-03-23 20:17:35 +01:00
• a0af092ecb fix wrong variable in unused function Mario 2019-03-23 20:01:20 +01:00
• 3a07a194ab Webfinger::zot_url() requires a string (webfinger address), empty var given in update_directory_entry() Mario 2019-03-23 19:42:22 +01:00
• 682ffa7cf5 db_columns() requires a string, empty var given in process_channel_sync_delivery() Mario 2019-03-23 19:21:28 +01:00
• dc4a4ca9d3 nomadic is not a parameter in the hz version of encode_item_collection zotlabs 2019-03-21 18:00:33 -07:00
• 3c2b6ce112 Merge branch 'origin' into 'master' harukin 2019-03-21 21:43:10 +09:00
• f8b3a395fb Merge branch 'origin' into 'japanese' harukin 2019-03-21 21:42:57 +09:00
• 087b45ab90 Merge branch 'origin' into 'develop' harukin 2019-03-21 21:42:45 +09:00
• 33ac85f637 bump version Mario Vavti 2019-03-21 11:16:35 +01:00
• efd9421dc9 Merge branch 'dev' Mario Vavti 2019-03-21 11:13:54 +01:00
• 9b696a872b bump version Mario Vavti 2019-03-21 11:01:57 +01:00
• aab515b16c optimize autoload cache and update changelog Mario Vavti 2019-03-21 11:01:01 +01:00
• f220628354 Merge branch 'dev' into 'dev' Mario 2019-03-21 09:46:36 +01:00
• 322bc5dc87 another whitespace to trigger tests Mario Vavti 2019-03-21 09:37:23 +01:00
• 75c3bda866 hubzilla core issue #1356 , permissions not getting decrypted on follow zotlabs 2019-03-20 16:09:34 -07:00
• b2b776169b just whitespace to trigger a new build test Mario Vavti 2019-03-20 14:02:18 +01:00
• 8e8d7ae614 Merge branch 'video' into 'dev' M. Dent 2019-03-20 03:17:01 +01:00
• fa1af5a2cb Video MarioandM. Dent 2019-03-20 03:17:01 +01:00
• a27e4072b4 Merge branch 'update_1231' into 'dev' Max Kostikov 2019-03-19 11:18:23 +01:00
• 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 Mario Vavti 2019-03-19 10:52:10 +01:00
• 1742159345 Merge branch 'dev' into 'dev' Mario 2019-03-19 09:17:39 +01:00
• ed8d2cb482 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev zotlabs 2019-03-18 20:42:58 -07:00
• 8e1f022810 share encoding issue between hz and zap zotlabs 2019-03-18 20:41:59 -07:00
• 4c25072c18 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev Mike Macgirvin 2019-03-19 13:13:21 +11:00
• 564ec32520 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mike Macgirvin 2019-03-19 13:12:39 +11:00
• a743feb040 Merge branch 'dev' of ../hz into dev zotlabs 2019-03-18 19:10:38 -07:00
• b028667de1 messagefilter enhancements, fix edge case in unsupported advisory privacy zotlabs 2019-03-18 19:09:12 -07:00
• 41888f84bc Merge branch 'dev' into 'dev' M. Dent 2019-03-19 00:56:29 +01:00
• 6a918dbde9 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mike Macgirvin 2019-03-19 09:05:27 +11:00
• 578230e32c fix typos Mario Vavti 2019-03-18 20:58:18 +00:00
• d486b03089 fix typos Mario Vavti 2019-03-18 21:58:18 +01:00
• 8559334339 some more xss prevention Mario Vavti 2019-03-18 20:30:25 +00:00
• 968c6ed8be some more xss prevention Mario Vavti 2019-03-18 21:30:25 +01:00
• 8893d9edc4 use urlencode Mario Vavti 2019-03-18 12:29:08 +00:00
• 43753ec113 ENT_COMPAT will only take care of double-quotes. Use double-quotes here to prevent XSS Mario Vavti 2019-03-18 12:19:24 +00:00
• 2ec3e4a912 use urlencode Mario Vavti 2019-03-18 13:29:08 +01:00
• a086745ec0 ENT_COMPAT will only take care of double-quotes. Use double-quotes here to prevent XSS Mario Vavti 2019-03-18 13:19:24 +01:00
• 51156d0582 Merge branch 'dev' into 'dev' Mario 2019-03-18 09:35:53 +01:00
• ea9925f489 clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible ZotandMario 2019-03-18 09:35:53 +01:00
• 026b96b8f2 clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible zotlabs 2019-03-17 17:56:29 -07:00
• 136b2ae37f calling unserialize on array in util/service_class zotlabs 2019-03-17 15:49:01 -07:00
• 97009a2748 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mike Macgirvin 2019-03-18 08:55:54 +11:00
• e123f7c743 add phpmd and phpcs to require-dev Mario 2019-03-17 21:42:14 +01:00
• e28bde6ccd Merge branch 'dreport_fixes' into 'dev' Max Kostikov 2019-03-17 12:16:20 +01:00
• a976f418e3 use php_eol for all mail header generation zotlabs 2019-03-16 15:28:21 -07:00
• 3c701e780c use the php_eol constant for encoded subjects zotlabs 2019-03-16 15:23:17 -07:00
• 769dd174bd fix dreport redeliver Mario Vavti 2019-03-15 23:10:17 +01:00
• e92514ee63 Merge branch 'dev' into 'dev' Mario 2019-03-15 19:12:51 +01:00
• 8ebc517b41 Merge branch 'dev' of ../hz into dev zotlabs 2019-03-14 21:19:56 -07:00
• 91b03e52f1 email_header_encode() producing lines of illegal length because header field length was not considered in length calculation. zotlabs 2019-03-14 21:18:17 -07:00
• a22406c9f8 Merge branch 'cleanup' into 'dev' M. Dent 2019-03-15 02:51:51 +01:00
• ebc3666c6f Cleanup and fixes MarioandM. Dent 2019-03-15 02:51:51 +01:00
• f1fee1239b Merge branch 'dev' Mario Vavti 2019-03-14 09:40:26 +01:00
• 8769fa0156 Merge branch 'dev' into 'dev' Mario 2019-03-14 09:38:46 +01:00
• f4d7338687 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev Mike Macgirvin 2019-03-14 10:34:22 +11:00
• 6a8c3f82ef Merge branch 'dev' of ../hz into dev zotlabs 2019-03-13 16:32:27 -07:00
• 05bcbfa28c signature issue for zot6 content imported from zotfeeds to hubzilla zotlabs 2019-03-13 16:31:37 -07:00
• 6a55500c1b Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev Mike Macgirvin 2019-03-14 10:30:01 +11:00
• 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. zotlabs 2019-03-13 16:27:52 -07:00
• 6ed7f47b3f Merge branch 'core_fixes_2' into 'dev' M. Dent 2019-03-13 18:16:33 +01:00
• a3e94855f9 add zot6 to clonable networks Mario Vavti 2019-03-13 17:48:00 +01:00
• 503da97a79 Merge branch 'dev' into 'dev' Mario 2019-03-13 09:40:19 +01:00
• 088a93e023 limit 1 Mike Macgirvin 2019-03-13 13:21:04 +11:00
• 30f71ad632 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev Mike Macgirvin 2019-03-13 10:42:25 +11:00
• 0026849821 Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev Mike Macgirvin 2019-03-13 10:40:23 +11:00
• cf5a310286 rework authenticated item fetches (check ACL on the parent, not on the requested item) zotlabs 2019-03-12 16:17:34 -07:00
• 72384ff2cb add owner permission checks to AS item fetch zotlabs 2019-03-12 15:17:25 -07:00
• c33ef01af8 Merge branch 'dev' into 'dev' Mario 2019-03-12 13:40:04 +01:00
• 11116bdcb7 typos zotlabs 2019-03-12 03:40:43 -07:00
• 09a5cf4e68 Merge branch 'dev' of ../hz into dev zotlabs 2019-03-11 22:24:13 -07:00
• a9172129d2 check zot6 in import_author_xchan zotlabs 2019-03-11 22:17:36 -07:00
• 3ec06705ca perform zot6 discovery in import_author_xchan Mike Macgirvin 2019-03-12 16:12:29 +11:00