Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | more work on z6 events | zotlabs | 2019-01-16 | 1 | -0/+37 | |
* | | | | | | | | | | | | more z6 compatibility fixes | zotlabs | 2019-01-16 | 4 | -3/+9 | |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | failure to import mail | zotlabs | 2019-01-10 | 1 | -2/+3 | |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
* | | | | | | | | | | make Apps::get_base_apps() pluggable | zotlabs | 2019-01-08 | 1 | -1/+3 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | better handling of notification updates while commenting | zotlabs | 2019-01-02 | 1 | -1/+6 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | allow notification updates when composing comments. This was disabled when it... | zotlabs | 2019-01-02 | 2 | -4/+4 | |
| |_|_|_|_|/ / |/| | | | | | | ||||||
* | | | | | | | like permission issue | zotlabs | 2018-12-20 | 1 | -1/+1 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | 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 '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 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | 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 | |
| |\ \ \ \ | | |_|/ / | |/| | | |