aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'channel_b64_enc_mid' into 'dev'Max Kostikov2018-12-181-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | make mod channel deal with b64 encoded mid\sMario Vavti2018-12-181-0/+8
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2018-12-183-97/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Remove scale_external_images()Max Kostikov2018-12-171-2/+0
| | * | | | | | | | | | Remove scale_external_images()Max Kostikov2018-12-171-93/+0
| | * | | | | | | | | | Remove scale_external_images()Max Kostikov2018-12-171-2/+0
| * | | | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-187-16/+42
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | more work on z6 eventszotlabs2019-01-161-0/+37
* | | | | | | | | | | | more z6 compatibility fixeszotlabs2019-01-164-3/+9
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | failure to import mailzotlabs2019-01-101-2/+3
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | make Apps::get_base_apps() pluggablezotlabs2019-01-081-1/+3
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | better handling of notification updates while commentingzotlabs2019-01-021-1/+6
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | allow notification updates when composing comments. This was disabled when it...zotlabs2019-01-022-4/+4
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | like permission issuezotlabs2018-12-201-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | 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 'dev' into 'dev'Mario2018-12-171-4/+10
| |\| | |
| | * | | Keep remote site headers for cachingMax Kostikov2018-12-171-4/+10
| * | | | Merge branch 'memory-warn2' into 'dev'Mario2018-12-171-0/+5
| |\ \ \ \
| | * | | | Update Zotlabs/Module/Setup.phpphani002018-12-161-1/+0
| | * | | | add warning if upload_filesize < 4MB.phani002018-12-161-0/+6
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-171-0/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2018-12-171-6/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Move SSLify code from Photo cache addonMax Kostikov2018-12-171-6/+5
| |/ / / / /
| * | | | | Revert Photos.php codeMax Kostikov2018-12-171-245/+1357
| * | | | | SSLify cached URL on redirect if neededMax Kostikov2018-12-171-1/+3
| * | | | | SSLify cached URL on redirect if neededMax Kostikov2018-12-171-1357/+245
| | |_|/ / | |/| | |
| * | | | Remove photo_cache_enable variableMax Kostikov2018-12-161-1/+1
| * | | | Merge branch 'patch-20181214a' into 'dev'Mario2018-12-161-2/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add return if no local_channel()DM42.Net (Matt Dent)2018-12-151-1/+3
| | * | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.DM42.Net (Matt Dent)2018-12-141-2/+8
| | | |/ | | |/|