Commit Graph

23831 Commits

Author SHA1 Message Date
DM42.Net (Matt Dent)
dba9c2fbb0 Add pgrp_extras hook & display 2019-01-13 14:34:04 -05:00
Mario
9e42dfd094 Merge branch 'patch-20190111a' into 'dev'
FIX: memory exhaustion on zot message pickup with large message queue

See merge request hubzilla/core!1466
2019-01-12 09:22:37 +01:00
M. Dent
8aa117e4ae FIX: memory exhaustion on zot message pickup with large message queue 2019-01-12 09:22:37 +01:00
Mario
f6f4e40a64 Merge branch 'patch-20190110a' into 'dev'
FIX: memory exhaustion on exceptionally large message queues & multiple...

See merge request hubzilla/core!1465
2019-01-11 20:03:34 +01:00
DM42.Net (Matt Dent)
caf2c0a6c4 Use dba_driver.php::db_getfunc() 2019-01-11 07:35:12 -05:00
Mario Vavti
dc8da4717f Merge remote-tracking branch 'mike/master' into dev 2019-01-11 10:14:06 +01:00
zotlabs
7b30fc4b82 failure to import mail 2019-01-10 15:02:58 -08:00
DM42.Net (Matt Dent)
6791b05a40 Fix for PGSQL/MYSQL difference 2019-01-10 15:29:24 -05:00
ZotSocial Admin
b54ddccd7b FIX: memory exhaustion on exceptionally large message queues & multiple Queue.php invocations duplicate work 2019-01-10 13:15:00 -05:00
Max Kostikov
d32360cb3e Merge branch 'core_fixes' into 'dev'
we must sslify all possible content variables

See merge request hubzilla/core!1464
2019-01-10 14:12:16 +01:00
Mario Vavti
01f4ce96f1 do not count removed channels 2019-01-10 13:35:27 +01:00
Mario Vavti
90b6afe06b we must sslify all possible content variables 2019-01-10 00:29:05 +01:00
M. Dent
b22caef65f Merge branch 'composer_updates' into 'dev'
update composer libs

See merge request hubzilla/core!1455
2019-01-09 19:09:20 +01:00
M. Dent
db4281164c Merge branch 'core_gallery_05' into 'dev'
core changes for gallery 05

See merge request hubzilla/core!1463
2019-01-09 19:04:52 +01:00
Mario Vavti
217c2cacaf Merge branch 'dev' into core_gallery_05 2019-01-09 10:30:44 +01:00
Mario Vavti
df4b6f0376 Merge remote-tracking branch 'mike/master' into dev 2019-01-09 10:25:04 +01:00
Mario
6ec1bfebec Merge branch 'patch-20190106a' into 'dev'
Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release'

See merge request hubzilla/core!1461
2019-01-09 10:16:53 +01:00
M. Dent
5d88326915 Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release' 2019-01-09 10:16:53 +01:00
Mario
24354b9dcc Merge branch 'patch-20190107a' into 'dev'
Tweak to deal with changes that may happen within the same second.

See merge request hubzilla/core!1462
2019-01-09 10:16:05 +01:00
zotlabs
39de8e28da make Apps::get_base_apps() pluggable 2019-01-08 14:14:55 -08:00
Mario Vavti
06beb59628 slightly improve item.is_new rendering 2019-01-08 15:23:08 +01:00
DM42.Net (Matt Dent)
563a5088be Tweak to deal with changes that may happen within the same second. 2019-01-07 19:48:14 -05:00
M. Dent
c10c59db4b Merge branch 'browser_compatibility' into 'dev'
fix issue with IE

See merge request hubzilla/core!1460
2019-01-07 17:09:26 +01:00
M. Dent
463f084b3e Merge branch 'update_bbcode' into 'dev'
Update bbcode

See merge request hubzilla/core!1459
2019-01-07 17:09:00 +01:00
Mario
312e0dcbc8 Update bbcode 2019-01-07 17:09:00 +01:00
Mario Vavti
6f93001658 fix issue with IE 2019-01-07 09:47:08 +01:00
Max Kostikov
48821a6da5 Merge branch 'check_content_type-1' into 'dev'
fix content type check

See merge request hubzilla/core!1458
2019-01-03 19:41:00 +01:00
Mario Vavti
b93bc142d3 missing closing parenthesis 2019-01-03 19:18:49 +01:00
Mario Vavti
ab9b8b8b0a fix content type check 2019-01-03 19:13:56 +01:00
Max Kostikov
1c4a90626a Merge branch 'revert-3f61d24d' into 'dev'
Revert "Merge branch 'check_content_type' into 'dev'"

See merge request hubzilla/core!1456
2019-01-03 17:18:52 +01:00
Max Kostikov
3bf1866f4a Revert "Merge branch 'check_content_type' into 'dev'"
This reverts merge request !1453
2019-01-03 17:13:40 +01:00
Max Kostikov
1a652b555f Merge branch 'update_boot' into 'dev'
add zotsite.net to directory fallback servers

See merge request hubzilla/core!1454
2019-01-03 16:32:31 +01:00
Max Kostikov
3f61d24d0a Merge branch 'check_content_type' into 'dev'
check suppported type if we get content type from header

See merge request hubzilla/core!1453
2019-01-03 16:31:48 +01:00
Max Kostikov
16064d5614 Merge branch 'fix_pconfig' into 'dev'
fix preg_match(): Delimiter must not be alphanumeric or backslash warning

See merge request hubzilla/core!1452
2019-01-03 16:30:14 +01:00
Mario Vavti
d9f21db623 Merge remote-tracking branch 'mike/master' into dev 2019-01-03 14:05:08 +01:00
zotlabs
8ac541e634 better handling of notification updates while commenting 2019-01-02 23:33:33 -08:00
Mario Vavti
da2688403e Merge remote-tracking branch 'mike/master' into dev 2019-01-02 23:07:37 +01:00
Mario Vavti
dbd230da74 update composer libs 2019-01-02 22:41:03 +01:00
zotlabs
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). 2019-01-02 12:49:04 -08:00
Mario
a19563e139 Revert "Use subselect"
This reverts commit a50433dd95
2019-01-02 19:56:11 +01:00
Mario
c4400cf72a Merge branch 'patch-20181230a' into 'dev'
Use subselect

See merge request hubzilla/core!1451
2019-01-02 19:47:39 +01:00
Mario Vavti
aae4943e64 add zotsite.net to directory fallback servers 2019-01-02 19:43:52 +01:00
Mario Vavti
b0339b848f fix preg_match(): Delimiter must not be alphanumeric or backslash warning 2019-01-02 17:53:28 +01:00
Mario Vavti
f3f106c21f check suppported type if we get content type from header 2019-01-02 17:49:21 +01:00
DM42.Net (Matt Dent)
a50433dd95 Use subselect 2018-12-30 15:05:45 -05:00
Max Kostikov
37d7d18bb7 Faster image processing with photo cache addon 2018-12-24 09:22:58 +01:00
Mario Vavti
cdb85f1309 update changelog 2018-12-22 21:00:01 +01:00
Mario
6d7fba6758 Merge branch 'fix_linkinfo_warning' into 'dev'
check if we deal with an array before sizeof()

See merge request hubzilla/core!1444
2018-12-22 20:18:41 +01:00
Mario Vavti
fac3579fb0 revert padding for text highlight. It is messing with indent punctuation and decreases legibility of the highlighted text. 2018-12-22 19:47:46 +01:00
Mario
458b023204 Merge branch 'dev' into 'dev'
Fix for cURL with default HTTP/2

See merge request hubzilla/core!1447
2018-12-21 21:35:54 +01:00