Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'core_gallery_05' into 'dev' | M. Dent | 2019-01-09 | 2 | -6/+6 |
|\ | |||||
| * | Merge branch 'dev' into core_gallery_05 | Mario Vavti | 2019-01-09 | 5 | -125/+33 |
| |\ | |/ |/| | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-09 | 1 | -1/+3 |
|\ \ | |||||
| * | | make Apps::get_base_apps() pluggable | zotlabs | 2019-01-08 | 1 | -1/+3 |
* | | | Merge branch 'patch-20190106a' into 'dev' | Mario | 2019-01-09 | 3 | -118/+19 |
|\ \ \ | |||||
| * | | | Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release' | M. Dent | 2019-01-09 | 3 | -118/+19 |
|/ / / | |||||
* | | | Merge branch 'patch-20190107a' into 'dev' | Mario | 2019-01-09 | 1 | -6/+11 |
|\ \ \ | |||||
| * | | | Tweak to deal with changes that may happen within the same second. | DM42.Net (Matt Dent) | 2019-01-07 | 1 | -6/+11 |
| | | * | slightly improve item.is_new rendering | Mario Vavti | 2019-01-08 | 2 | -6/+6 |
| |_|/ |/| | | |||||
* | | | Merge branch 'browser_compatibility' into 'dev' | M. Dent | 2019-01-07 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | fix issue with IE | Mario Vavti | 2019-01-07 | 1 | -1/+5 |
| |/ / | |||||
* | | | Merge branch 'update_bbcode' into 'dev' | M. Dent | 2019-01-07 | 1 | -14/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update bbcode | Mario | 2019-01-07 | 1 | -14/+3 |
|/ / | |||||
* | | Merge branch 'check_content_type-1' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -5/+8 |
|\ \ | |||||
| * | | missing closing parenthesis | Mario Vavti | 2019-01-03 | 1 | -1/+1 |
| * | | fix content type check | Mario Vavti | 2019-01-03 | 1 | -5/+8 |
|/ / | |||||
* | | Merge branch 'revert-3f61d24d' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -7/+4 |
|\ \ | |||||
| * | | Revert "Merge branch 'check_content_type' into 'dev'" | Max Kostikov | 2019-01-03 | 1 | -7/+4 |
|/ / | |||||
* | | Merge branch 'update_boot' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -1/+2 |
|\ \ | |||||
| * | | add zotsite.net to directory fallback servers | Mario Vavti | 2019-01-02 | 1 | -1/+2 |
* | | | Merge branch 'check_content_type' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -4/+7 |
|\ \ \ | |||||
| * | | | check suppported type if we get content type from header | Mario Vavti | 2019-01-02 | 1 | -4/+7 |
| |/ / | |||||
* | | | Merge branch 'fix_pconfig' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix preg_match(): Delimiter must not be alphanumeric or backslash warning | Mario Vavti | 2019-01-02 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-03 | 1 | -1/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | better handling of notification updates while commenting | zotlabs | 2019-01-02 | 1 | -1/+6 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-02 | 2 | -4/+4 |
|\| | | |||||
| * | | allow notification updates when composing comments. This was disabled when it... | zotlabs | 2019-01-02 | 2 | -4/+4 |
* | | | Revert "Use subselect" | Mario | 2019-01-02 | 1 | -4/+4 |
* | | | Merge branch 'patch-20181230a' into 'dev' | Mario | 2019-01-02 | 1 | -4/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Use subselect | DM42.Net (Matt Dent) | 2018-12-30 | 1 | -4/+4 |
* | | | Faster image processing with photo cache addon | Max Kostikov | 2018-12-24 | 1 | -5/+6 |
* | | | update changelog | Mario Vavti | 2018-12-22 | 1 | -0/+18 |
* | | | Merge branch 'fix_linkinfo_warning' into 'dev' | Mario | 2018-12-22 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | use count() instead of sizeof() | Mario Vavti | 2018-12-19 | 1 | -1/+1 |
| * | | | check if we deal with an array before sizeof() | Mario Vavti | 2018-12-19 | 1 | -3/+3 |
* | | | | revert padding for text highlight. It is messing with indent punctuation and ... | Mario Vavti | 2018-12-22 | 1 | -2/+1 |
* | | | | Merge branch 'dev' into 'dev' | Mario | 2018-12-21 | 1 | -13/+4 |
|\ \ \ \ | |||||
| * | | | | Fix for cURL with default HTTP/2 | Max Kostikov | 2018-12-20 | 1 | -13/+4 |
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-20 | 1 | -4/+13 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-20 | 16 | -41/+196 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'remove-legacy-photo-cache-prevention' into 'dev' | Max Kostikov | 2018-12-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | do not add timestamp to the photo src. caching is handled in mod photo now. | Mario Vavti | 2018-12-21 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | like permission issue | zotlabs | 2018-12-20 | 1 | -1/+1 |
* | | | | | | Merge branch 'revert-090fe394' into 'dev' | Max Kostikov | 2018-12-20 | 1 | -4/+13 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Revert "Fix cURL with HTTP/2" | Max Kostikov | 2018-12-20 | 1 | -4/+13 |
|/ / / / / | |||||
* | | | | | Fix cURL with HTTP/2 | Max Kostikov | 2018-12-20 | 1 | -13/+4 |
* | | | | | missing observer check | Mario Vavti | 2018-12-20 | 1 | -0/+3 |
* | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-20 | 1 | -2/+87 |
|\| | | | |