Mario
|
2e94e4cd67
|
Merge branch 'core_fixes' into 'dev'
Core fixes
See merge request hubzilla/core!1470
|
2019-01-15 11:38:41 +01:00 |
|
Mario Vavti
|
c26e112bee
|
whitespace
|
2019-01-14 15:06:21 +01:00 |
|
Mario Vavti
|
7daf18b077
|
fix a new instance of autocomplete created on each conversation update
|
2019-01-14 14:07:56 +01:00 |
|
Mario
|
a8a5d2fc4e
|
Merge branch 'patch-20190113c' into 'dev'
Hooks to allow addons to add "extras" to privacy group settings edit page.
See merge request hubzilla/core!1469
|
2019-01-14 10:29:48 +01:00 |
|
Mario
|
90f6abfa7c
|
Merge branch 'patch-20190113a' into 'dev'
Add collect_public_recipients hook
See merge request hubzilla/core!1467
|
2019-01-14 10:29:19 +01:00 |
|
Mario Vavti
|
65f2d7fd66
|
Merge branch 'dev' into core_fixes
|
2019-01-14 10:14:44 +01:00 |
|
Mario Vavti
|
f3554804bf
|
only load new content onpopstate if the mid has actually changed
|
2019-01-14 10:14:37 +01:00 |
|
DM42.Net (Matt Dent)
|
f5e571ba40
|
Remove stray $
|
2019-01-13 20:04:12 -05:00 |
|
DM42.Net (Matt Dent)
|
e43331b7a2
|
Add privacygroup_extras_post/drop hooks
|
2019-01-13 15:43:25 -05:00 |
|
Max Kostikov
|
e78fd09e07
|
Merge branch 'patch-20190113b' into 'dev'
FIX: aggregated query error in MYSQL
See merge request hubzilla/core!1468
|
2019-01-13 20:49:03 +01:00 |
|
DM42.Net (Matt Dent)
|
b4c1ca88f3
|
move order by and rewrite similar in update_queue_item()
|
2019-01-13 14:41:44 -05:00 |
|
DM42.Net (Matt Dent)
|
dba9c2fbb0
|
Add pgrp_extras hook & display
|
2019-01-13 14:34:04 -05:00 |
|
DM42.Net (Matt Dent)
|
ab074f52fe
|
outq_created not outq_scheduled
|
2019-01-13 14:10:35 -05:00 |
|
DM42.Net (Matt Dent)
|
121fa834d5
|
FIX: aggregated query error in MYSQL
|
2019-01-13 14:06:36 -05:00 |
|
DM42.Net (Matt Dent)
|
598cbf2210
|
Add collect_public_recipients hook
|
2019-01-12 22:37:44 -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 |
|