aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | like permission issuezotlabs2018-12-201-1/+1
* | | | | | Merge branch 'revert-090fe394' into 'dev'Max Kostikov2018-12-201-4/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert "Fix cURL with HTTP/2"Max Kostikov2018-12-201-4/+13
|/ / / / /
* | | | | Fix cURL with HTTP/2Max Kostikov2018-12-201-13/+4
* | | | | missing observer checkMario Vavti2018-12-201-0/+3
* | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-201-2/+87
|\| | | |
| * | | | reverse activity mapping improvementszotlabs2018-12-191-2/+87
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-1719-21/+171
| |\ \ \ \
* | \ \ \ \ Merge branch 'dark-fix-dev' into 'dev'Mario2018-12-193-21/+28
|\ \ \ \ \ \
| * | | | | | remove color from style.css (default) but add a little padding; add color & b...phani002018-12-182-1/+7
| * | | | | | change hl text color to the default text color in non-dark schema. looks good...phani002018-12-181-1/+1
| * | | | | | remove some fancy formatting.phani002018-12-182-5/+0
| * | | | | | new fix for dark themephani002018-12-173-25/+28
| * | | | | | Merge branch 'dev' into dark-fix-devphani002018-12-174-8/+35
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | remove my dark theme fixes.phani002018-12-171-5/+8
* | | | | | | Merge branch 'util-reload_addons' into 'dev'Mario2018-12-191-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Add reload to util/addonsM. Dent2018-12-191-0/+15
|/ / / / / / /