aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* FIX: memory exhaustion on exceptionally large message queues & multiple Queue...ZotSocial Admin2019-01-101-2/+10
* Merge branch 'core_fixes' into 'dev'Max Kostikov2019-01-101-1/+8
|\
| * 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 libsMario Vavti2019-01-0218-146/+362
* | Merge branch 'core_gallery_05' into 'dev'M. Dent2019-01-092-6/+6
|\ \
| * \ 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'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.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 IEMario Vavti2019-01-071-1/+5
| |/ / /
* | | | Merge branch 'update_bbcode' into 'dev'M. Dent2019-01-071-14/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Update bbcodeMario2019-01-071-14/+3
|/ / /
* | | Merge branch 'check_content_type-1' into 'dev'Max Kostikov2019-01-031-5/+8
|\ \ \
| * | | 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'"Max Kostikov2019-01-031-7/+4
|/ / /
* | | Merge branch 'update_boot' into 'dev'Max Kostikov2019-01-031-1/+2
|\ \ \
| * | | 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 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 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 it...zotlabs2019-01-022-4/+4
* | | Revert "Use subselect"Mario2019-01-021-4/+4
* | | Merge branch 'patch-20181230a' into 'dev'Mario2019-01-021-4/+4
|\ \ \ | |_|/ |/| |
| * | Use subselectDM42.Net (Matt Dent)2018-12-301-4/+4
* | | Faster image processing with photo cache addonMax Kostikov2018-12-241-5/+6
* | | update changelogMario Vavti2018-12-221-0/+18
* | | Merge branch 'fix_linkinfo_warning' into 'dev'Mario2018-12-221-3/+3
|\ \ \
| * | | use count() instead of sizeof()Mario Vavti2018-12-191-1/+1
| * | | check if we deal with an array before sizeof()Mario Vavti2018-12-191-3/+3
* | | | revert padding for text highlight. It is messing with indent punctuation and ...Mario Vavti2018-12-221-2/+1
* | | | Merge branch 'dev' into 'dev'Mario2018-12-211-13/+4
|\ \ \ \
| * | | | Fix for cURL with default HTTP/2Max Kostikov2018-12-201-13/+4
| * | | | Merge branch 'dev' into 'dev'Max Kostikov2018-12-201-4/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2018-12-2016-41/+196
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'remove-legacy-photo-cache-prevention' into 'dev'Max Kostikov2018-12-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | do not add timestamp to the photo src. caching is handled in mod photo now.Mario Vavti2018-12-211-1/+1
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-211-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |