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

• e6ccdc2378 Merge branch 'queue_fixes_1' into 'dev' M. Dent 2019-01-16 15:58:13 +01:00
• 4450a01014 do not return if delivery report could not bedecrypted Mario Vavti 2019-01-16 15:09:18 +01:00
• bb962b90cc edit translation harukin 2019-01-16 21:19:38 +09:00
• a1ac507a94 change logic for consistency Mario Vavti 2019-01-16 10:02:13 +01:00
• ad6eb15eac fix legacy zot dreport not passing the is_storable check Mario Vavti 2019-01-15 22:36:01 +01:00
• 2e94e4cd67 Merge branch 'core_fixes' into 'dev' Mario 2019-01-15 11:38:41 +01:00
• 44f75d94e1 edit translation harukin 2019-01-15 18:07:33 +09:00
• ad89310c45 edit translation harukin 2019-01-15 17:36:43 +09:00
• c26e112bee whitespace Mario Vavti 2019-01-14 15:06:21 +01:00
• 7daf18b077 fix a new instance of autocomplete created on each conversation update Mario Vavti 2019-01-14 14:07:56 +01:00
• a8a5d2fc4e Merge branch 'patch-20190113c' into 'dev' Mario 2019-01-14 10:29:48 +01:00
• 90f6abfa7c Merge branch 'patch-20190113a' into 'dev' Mario 2019-01-14 10:29:19 +01:00
• 65f2d7fd66 Merge branch 'dev' into core_fixes Mario Vavti 2019-01-14 10:14:44 +01:00
• f3554804bf only load new content onpopstate if the mid has actually changed Mario Vavti 2019-01-14 10:14:37 +01:00
• f5e571ba40 Remove stray $ DM42.Net (Matt Dent) 2019-01-13 20:04:12 -05:00
• e43331b7a2 Add privacygroup_extras_post/drop hooks DM42.Net (Matt Dent) 2019-01-13 15:43:25 -05:00
• e78fd09e07 Merge branch 'patch-20190113b' into 'dev' Max Kostikov 2019-01-13 20:49:03 +01:00
• b4c1ca88f3 move order by and rewrite similar in update_queue_item() DM42.Net (Matt Dent) 2019-01-13 14:41:44 -05:00
• dba9c2fbb0 Add pgrp_extras hook & display DM42.Net (Matt Dent) 2019-01-13 14:34:04 -05:00
• ab074f52fe outq_created not outq_scheduled DM42.Net (Matt Dent) 2019-01-13 14:10:35 -05:00
• 121fa834d5 FIX: aggregated query error in MYSQL DM42.Net (Matt Dent) 2019-01-13 14:06:36 -05:00
• 598cbf2210 Add collect_public_recipients hook DM42.Net (Matt Dent) 2019-01-12 22:37:44 -05:00
• f481ba1c1c edit translation harukin 2019-01-13 10:39:40 +09:00
• 9e42dfd094 Merge branch 'patch-20190111a' into 'dev' Mario 2019-01-12 09:22:37 +01:00
• 8aa117e4ae FIX: memory exhaustion on zot message pickup with large message queue M. DentandMario 2019-01-12 09:22:37 +01:00
• f6f4e40a64 Merge branch 'patch-20190110a' into 'dev' Mario 2019-01-11 20:03:34 +01:00
• caf2c0a6c4 Use dba_driver.php::db_getfunc() DM42.Net (Matt Dent) 2019-01-11 07:35:12 -05:00
• 57dde3e980 failure to import mail zotlabsandMario 2019-01-10 23:02:58 +00:00
• dc8da4717f Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-11 10:14:06 +01:00
• 7b30fc4b82 failure to import mail zotlabs 2019-01-10 15:02:58 -08:00
• 6791b05a40 Fix for PGSQL/MYSQL difference DM42.Net (Matt Dent) 2019-01-10 15:29:24 -05:00
• b54ddccd7b FIX: memory exhaustion on exceptionally large message queues & multiple Queue.php invocations duplicate work ZotSocial AdminandDM42.Net (Matt Dent) 2019-01-09 21:23:12 -05:00
• d32360cb3e Merge branch 'core_fixes' into 'dev' Max Kostikov 2019-01-10 14:12:16 +01:00
• 3eba0c2297 do not count removed channels Mario Vavti 2019-01-10 12:35:27 +00:00
• 01f4ce96f1 do not count removed channels Mario Vavti 2019-01-10 13:35:27 +01:00
• 90b6afe06b we must sslify all possible content variables Mario Vavti 2019-01-10 00:29:05 +01:00
• b22caef65f Merge branch 'composer_updates' into 'dev' M. Dent 2019-01-09 19:09:20 +01:00
• db4281164c Merge branch 'core_gallery_05' into 'dev' M. Dent 2019-01-09 19:04:52 +01:00
• 217c2cacaf Merge branch 'dev' into core_gallery_05 Mario Vavti 2019-01-09 10:30:44 +01:00
• df4b6f0376 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-09 10:25:04 +01:00
• 6ec1bfebec Merge branch 'patch-20190106a' into 'dev' Mario 2019-01-09 10:16:53 +01:00
• 5d88326915 Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release' M. DentandMario 2019-01-09 10:16:53 +01:00
• 24354b9dcc Merge branch 'patch-20190107a' into 'dev' Mario 2019-01-09 10:16:05 +01:00
• 39de8e28da make Apps::get_base_apps() pluggable zotlabs 2019-01-08 14:14:55 -08:00
• 06beb59628 slightly improve item.is_new rendering Mario Vavti 2019-01-08 15:23:08 +01:00
• 2dbe567e3b edit translation harukin 2019-01-08 21:48:31 +09:00
• 563a5088be Tweak to deal with changes that may happen within the same second. DM42.Net (Matt Dent) 2019-01-07 19:48:14 -05:00
• c10c59db4b Merge branch 'browser_compatibility' into 'dev' M. Dent 2019-01-07 17:09:26 +01:00
• 463f084b3e Merge branch 'update_bbcode' into 'dev' M. Dent 2019-01-07 17:09:00 +01:00
• 312e0dcbc8 Update bbcode MarioandM. Dent 2019-01-07 17:09:00 +01:00
• 6f93001658 fix issue with IE Mario Vavti 2019-01-07 09:47:08 +01:00
• 48821a6da5 Merge branch 'check_content_type-1' into 'dev' Max Kostikov 2019-01-03 19:41:00 +01:00
• b93bc142d3 missing closing parenthesis Mario Vavti 2019-01-03 19:18:49 +01:00
• ab9b8b8b0a fix content type check Mario Vavti 2019-01-03 19:13:56 +01:00
• 1c4a90626a Merge branch 'revert-3f61d24d' into 'dev' Max Kostikov 2019-01-03 17:18:52 +01:00
• 3bf1866f4a Revert "Merge branch 'check_content_type' into 'dev'" Max Kostikov 2019-01-03 17:13:40 +01:00
• 1a652b555f Merge branch 'update_boot' into 'dev' Max Kostikov 2019-01-03 16:32:31 +01:00
• 3f61d24d0a Merge branch 'check_content_type' into 'dev' Max Kostikov 2019-01-03 16:31:48 +01:00
• 16064d5614 Merge branch 'fix_pconfig' into 'dev' Max Kostikov 2019-01-03 16:30:14 +01:00
• d9f21db623 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-03 14:05:08 +01:00
• 8ac541e634 better handling of notification updates while commenting zotlabs 2019-01-02 23:33:33 -08:00
• da2688403e Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2019-01-02 23:07:37 +01:00
• dbd230da74 update composer libs Mario Vavti 2019-01-02 22:41:03 +01:00
• f660530ef5 allow notification updates when composing comments. This was disabled when it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed). zotlabs 2019-01-02 12:49:04 -08:00
• a19563e139 Revert "Use subselect" Mario 2019-01-02 19:56:11 +01:00
• c4400cf72a Merge branch 'patch-20181230a' into 'dev' Mario 2019-01-02 19:47:39 +01:00
• aae4943e64 add zotsite.net to directory fallback servers Mario Vavti 2019-01-02 19:43:52 +01:00
• b0339b848f fix preg_match(): Delimiter must not be alphanumeric or backslash warning Mario Vavti 2019-01-02 17:53:28 +01:00
• f3f106c21f check suppported type if we get content type from header Mario Vavti 2019-01-02 17:49:21 +01:00
• 7fbff885dd edit translation harukin 2019-01-01 15:22:09 +09:00
• 60b0e652df edit translation harukin 2018-12-31 12:04:53 +09:00
• bb3405ef60 edit translation harukin 2018-12-31 11:57:32 +09:00
• 9ef0883011 edit translation harukin 2018-12-31 10:36:15 +09:00
• a50433dd95 Use subselect DM42.Net (Matt Dent) 2018-12-30 15:05:45 -05:00
• 37d7d18bb7 Faster image processing with photo cache addon Max Kostikov 2018-12-24 09:22:58 +01:00
• fa0176c1e6 Merge branch 'develop' into 'japanese' harukin 2018-12-24 01:00:50 +09:00
• 695c60c3fe Merge branch 'develop' into 'master' harukin 2018-12-24 01:00:22 +09:00
• ffadb70d81 Merge branch 'origin' into 'develop' harukin 2018-12-24 00:54:15 +09:00
• 414b7e28d3 bump version Mario 2018-12-22 21:02:49 +01:00
• fca464071f update changelog Mario Vavti 2018-12-22 20:00:01 +00:00
• cdb85f1309 update changelog Mario Vavti 2018-12-22 21:00:01 +01:00
• 4f08f4b84c use count() instead of sizeof() Mario Vavti 2018-12-19 10:08:28 +00:00
• 1b5175d018 check if we deal with an array before sizeof() Mario Vavti 2018-12-19 09:05:18 +00:00
• 6d7fba6758 Merge branch 'fix_linkinfo_warning' into 'dev' Mario 2018-12-22 20:18:41 +01:00
• 0bfda6d4c8 revert padding for text highlight. It is messing with indent punctuation and decreases legibility of the highlighted text. Mario Vavti 2018-12-22 18:47:46 +00:00
• 880b22604b manualy Fix cURL with HTTP/2 due to merge conflicts Mario 2018-12-22 20:17:20 +01:00
• 04a2dc075f manualy remove scale_external_images() due to merge conflicts Mario 2018-12-22 20:08:44 +01:00
• 01448c152c Remove scale_external_images() Max KostikovandMario 2018-12-17 12:28:58 +00:00
• a09beb3833 Remove scale_external_images() Max KostikovandMario 2018-12-17 12:28:18 +00:00
• feda1e6d84 remove color from style.css (default) but add a little padding; add color & border radius to dark.css. phani00andMario 2018-12-18 16:54:39 +00:00
• 4256bea418 change hl text color to the default text color in non-dark schema. looks good, except in dark, where i can change it in dark.css. phani00andMario 2018-12-18 13:02:50 +00:00
• 4d47b098e5 remove some fancy formatting. phani00andMario 2018-12-18 11:37:51 +00:00
• 163754a46c make mod channel deal with b64 encoded mid\s ; Mario Vavti 2018-12-18 09:43:06 +00:00
• 66b56416b6 new fix for dark theme phani00andMario 2018-12-17 15:28:15 +00:00
• c855346358 remove my dark theme fixes. phani00andMario 2018-12-17 10:08:45 +00:00
• 0e32c86c3d Update OAuth2Storage.php - fix email retrieval in getUser Pascal DeklerckandMario 2018-12-15 21:19:18 +00:00
• fac3579fb0 revert padding for text highlight. It is messing with indent punctuation and decreases legibility of the highlighted text. Mario Vavti 2018-12-22 19:47:46 +01:00
• 19952264c8 Add reload to util/addons M. DentandMario 2018-12-19 09:12:59 +00:00
• 5ec1e97cae do not add timestamp to the photo src. caching is handled in mod photo now. Mario Vavti 2018-12-21 11:51:19 +00:00
• 5f5746a2f6 like permission issue zotlabsandMario 2018-12-20 19:06:52 +00:00