| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
|\ |
|
| * | reverse activity mapping improvements | zotlabs | 2018-12-19 | 1 | -2/+87 |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-17 | 19 | -21/+171 |
| |\ |
|
* | \ | Merge branch 'dark-fix-dev' into 'dev' | Mario | 2018-12-19 | 3 | -21/+28 |
|\ \ \ |
|
| * | | | remove color from style.css (default) but add a little padding; add color & b... | phani00 | 2018-12-18 | 2 | -1/+7 |
| * | | | change hl text color to the default text color in non-dark schema. looks good... | phani00 | 2018-12-18 | 1 | -1/+1 |
| * | | | remove some fancy formatting. | phani00 | 2018-12-18 | 2 | -5/+0 |
| * | | | new fix for dark theme | phani00 | 2018-12-17 | 3 | -25/+28 |
| * | | | Merge branch 'dev' into dark-fix-dev | phani00 | 2018-12-17 | 4 | -8/+35 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | remove my dark theme fixes. | phani00 | 2018-12-17 | 1 | -5/+8 |
* | | | | Merge branch 'util-reload_addons' into 'dev' | Mario | 2018-12-19 | 1 | -0/+15 |
|\ \ \ \ |
|
| * | | | | Add reload to util/addons | M. Dent | 2018-12-19 | 1 | -0/+15 |
|/ / / / |
|
* | | | | Merge branch 'channel_b64_enc_mid' into 'dev' | Max Kostikov | 2018-12-18 | 1 | -0/+8 |
|\ \ \ \ |
|
| * | | | | make mod channel deal with b64 encoded mid\s | Mario Vavti | 2018-12-18 | 1 | -0/+8 |
|/ / / / |
|
* | | | | Merge branch 'dev' into 'dev' | Mario | 2018-12-18 | 3 | -97/+0 |
|\ \ \ \ |
|
| * | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -2/+0 |
| * | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -93/+0 |
| * | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -2/+0 |
* | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-18 | 7 | -16/+42 |
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | regression: mail from dev to core not delivering | zotlabs | 2018-12-17 | 2 | -1/+8 |
| * | | | fix default values for affinity tool and other information which could be los... | zotlabs | 2018-12-17 | 5 | -15/+34 |
* | | | | Merge branch 'dev' into 'dev' | Mario | 2018-12-17 | 1 | -4/+10 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Keep remote site headers for caching | Max Kostikov | 2018-12-17 | 1 | -4/+10 |
* | | | | Merge branch 'memory-warn2' into 'dev' | Mario | 2018-12-17 | 1 | -0/+5 |
|\ \ \ \ |
|
| * | | | | Update Zotlabs/Module/Setup.php | phani00 | 2018-12-16 | 1 | -1/+0 |
| * | | | | add warning if upload_filesize < 4MB. | phani00 | 2018-12-16 | 1 | -0/+6 |
* | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-17 | 1 | -0/+15 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | default curl to http/1.1 | zotlabs | 2018-12-16 | 1 | -0/+15 |
| * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-13 | 10 | -438/+493 |
| |\ \ \ \ |
|
* | \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-17 | 1 | -6/+5 |
|\ \ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| * | | | | | Move SSLify code from Photo cache addon | Max Kostikov | 2018-12-17 | 1 | -6/+5 |
|/ / / / / |
|
* | | | | | Revert Photos.php code | Max Kostikov | 2018-12-17 | 1 | -245/+1357 |
* | | | | | SSLify cached URL on redirect if needed | Max Kostikov | 2018-12-17 | 1 | -1/+3 |
* | | | | | SSLify cached URL on redirect if needed | Max Kostikov | 2018-12-17 | 1 | -1357/+245 |
| |_|_|/
|/| | | |
|
* | | | | Remove photo_cache_enable variable | Max Kostikov | 2018-12-16 | 1 | -1/+1 |
* | | | | Merge branch 'patch-20181214a' into 'dev' | Mario | 2018-12-16 | 1 | -2/+10 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Add return if no local_channel() | DM42.Net (Matt Dent) | 2018-12-15 | 1 | -1/+3 |
| * | | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -2/+8 |
* | | | | Merge branch 'dev' into 'dev' | M. Dent | 2018-12-15 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Update OAuth2Storage.php - fix email retrieval in getUser | Pascal Deklerck | 2018-12-15 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge branch 'custom-item-types' into 'dev' | Mario | 2018-12-15 | 6 | -0/+98 |
|\ \ \ \ |
|
| * | | | | Add ITEM_TYPE_CUSTOM and hooks for processing custom item types | DM42.Net (Matt Dent) | 2018-12-14 | 6 | -0/+98 |
| |/ / / |
|
* | | | | Merge branch 'patch-20181214f' into 'dev' | Mario | 2018-12-15 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specified | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -2/+2 |
| |/ / / |
|
* | | | | Merge branch 'patch-20181214d' into 'dev' | Mario | 2018-12-15 | 3 | -2/+22 |
|\ \ \ \ |
|
| * | | | | Fix syntax error | DM42.Net (Matt Dent) | 2018-12-14 | 2 | -2/+2 |
| * | | | | Make Affinity Slider (optionally) 'sticky' across page loads. (default is cur... | DM42.Net (Matt Dent) | 2018-12-14 | 3 | -2/+22 |
| |/ / / |
|
* | | | | fix wiki preview issue with hyperlinks | Mario Vavti | 2018-12-15 | 1 | -2/+2 |
* | | | | Merge branch 'patch-20181214b' into 'dev' | Max Kostikov | 2018-12-14 | 1 | -1/+1 |
|\ \ \ \ |
|