aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-20190113a' into 'dev'Mario2019-01-143-2/+62
|\ | | | | | | | | Add collect_public_recipients hook See merge request hubzilla/core!1467
| * Add collect_public_recipients hookDM42.Net (Matt Dent)2019-01-123-2/+62
| |
* | Merge branch 'patch-20190113b' into 'dev'Max Kostikov2019-01-132-3/+3
|\ \ | | | | | | | | | | | | FIX: aggregated query error in MYSQL See merge request hubzilla/core!1468
| * | move order by and rewrite similar in update_queue_item()DM42.Net (Matt Dent)2019-01-132-3/+3
| | |
| * | outq_created not outq_scheduledDM42.Net (Matt Dent)2019-01-131-1/+1
| | |
| * | FIX: aggregated query error in MYSQLDM42.Net (Matt Dent)2019-01-131-1/+1
|/ /
* | Merge branch 'patch-20190111a' into 'dev'Mario2019-01-121-2/+18
|\ \ | |/ |/| | | | | FIX: memory exhaustion on zot message pickup with large message queue See merge request hubzilla/core!1466
| * FIX: memory exhaustion on zot message pickup with large message queueM. Dent2019-01-121-2/+18
|/
* Merge branch 'patch-20190110a' into 'dev'Mario2019-01-111-3/+12
|\ | | | | | | | | FIX: memory exhaustion on exceptionally large message queues & multiple... See merge request hubzilla/core!1465
| * Use dba_driver.php::db_getfunc()DM42.Net (Matt Dent)2019-01-111-10/+2
| |
| * Fix for PGSQL/MYSQL differenceDM42.Net (Matt Dent)2019-01-101-2/+11
| |
| * FIX: memory exhaustion on exceptionally large message queues & multiple ↵ZotSocial Admin2019-01-101-2/+10
| | | | | | | | Queue.php invocations duplicate work
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-111-2/+3
|\ \ | |/ |/|
| * failure to import mailzotlabs2019-01-101-2/+3
| |
* | Merge branch 'core_fixes' into 'dev'Max Kostikov2019-01-101-1/+8
|\ \ | | | | | | | | | | | | we must sslify all possible content variables See merge request hubzilla/core!1464
| * | we must sslify all possible content variablesMario Vavti2019-01-101-1/+8
| | |
* | | do not count removed channelsMario Vavti2019-01-101-1/+1
|/ /
* | Merge branch 'composer_updates' into 'dev'M. Dent2019-01-0918-146/+362
|\ \ | | | | | | | | | | | | update composer libs See merge request hubzilla/core!1455
| * | update composer libsMario Vavti2019-01-0218-146/+362
| | |
* | | Merge branch 'core_gallery_05' into 'dev'M. Dent2019-01-092-6/+6
|\ \ \ | | | | | | | | | | | | | | | | core changes for gallery 05 See merge request hubzilla/core!1463
| * \ \ Merge branch 'dev' into core_gallery_05Mario Vavti2019-01-095-125/+33
| |\ \ \ | |/ / / |/| | |
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-091-1/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | make Apps::get_base_apps() pluggablezotlabs2019-01-081-1/+3
| | | |
* | | | Merge branch 'patch-20190106a' into 'dev'Mario2019-01-093-118/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release' See merge request hubzilla/core!1461
| * | | | Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release'M. Dent2019-01-093-118/+19
|/ / / /
* | | | Merge branch 'patch-20190107a' into 'dev'Mario2019-01-091-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Tweak to deal with changes that may happen within the same second. See merge request hubzilla/core!1462
| * | | | Tweak to deal with changes that may happen within the same second.DM42.Net (Matt Dent)2019-01-071-6/+11
| | | | |
| | | * | slightly improve item.is_new renderingMario Vavti2019-01-082-6/+6
| |_|/ / |/| | |
* | | | Merge branch 'browser_compatibility' into 'dev'M. Dent2019-01-071-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fix issue with IE See merge request hubzilla/core!1460
| * | | | fix issue with IEMario Vavti2019-01-071-1/+5
| |/ / /
* | | | Merge branch 'update_bbcode' into 'dev'M. Dent2019-01-071-14/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Update bbcode See merge request hubzilla/core!1459
| * | | Update bbcodeMario2019-01-071-14/+3
|/ / /
* | | Merge branch 'check_content_type-1' into 'dev'Max Kostikov2019-01-031-5/+8
|\ \ \ | | | | | | | | | | | | | | | | fix content type check See merge request hubzilla/core!1458
| * | | missing closing parenthesisMario Vavti2019-01-031-1/+1
| | | |
| * | | fix content type checkMario Vavti2019-01-031-5/+8
|/ / /
* | | Merge branch 'revert-3f61d24d' into 'dev'Max Kostikov2019-01-031-7/+4
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'check_content_type' into 'dev'" See merge request hubzilla/core!1456
| * | | Revert "Merge branch 'check_content_type' into 'dev'"Max Kostikov2019-01-031-7/+4
|/ / / | | | | | | This reverts merge request !1453
* | | Merge branch 'update_boot' into 'dev'Max Kostikov2019-01-031-1/+2
|\ \ \ | | | | | | | | | | | | | | | | add zotsite.net to directory fallback servers See merge request hubzilla/core!1454
| * | | add zotsite.net to directory fallback serversMario Vavti2019-01-021-1/+2
| | | |
* | | | Merge branch 'check_content_type' into 'dev'Max Kostikov2019-01-031-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | check suppported type if we get content type from header See merge request hubzilla/core!1453
| * | | | check suppported type if we get content type from headerMario Vavti2019-01-021-4/+7
| |/ / /
* | | | Merge branch 'fix_pconfig' into 'dev'Max Kostikov2019-01-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fix preg_match(): Delimiter must not be alphanumeric or backslash warning See merge request hubzilla/core!1452
| * | | | fix preg_match(): Delimiter must not be alphanumeric or backslash warningMario Vavti2019-01-021-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-031-1/+6
|\ \ \ \ | | |/ / | |/| |
| * | | better handling of notification updates while commentingzotlabs2019-01-021-1/+6
| | | |
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-022-4/+4
|\| | | | |_|/ |/| |
| * | allow notification updates when composing comments. This was disabled when ↵zotlabs2019-01-022-4/+4
| | | | | | | | | | | | 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).
* | | Revert "Use subselect"Mario2019-01-021-4/+4
| | | | | | | | | This reverts commit a50433dd958ec52eec88867517b3ae6467758618
* | | Merge branch 'patch-20181230a' into 'dev'Mario2019-01-021-4/+4
|\ \ \ | |_|/ |/| | | | | | | | Use subselect See merge request hubzilla/core!1451
| * | Use subselectDM42.Net (Matt Dent)2018-12-301-4/+4
| | |