Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario | 2018-11-22 | 2 | -1/+4 |
|\ | |||||
| * | no mention notifications from mastodon (and pleroma) | zotlabs | 2018-11-21 | 1 | -1/+1 |
| | | |||||
| * | use this form instead | zotlabs | 2018-11-19 | 1 | -2/+1 |
| | | |||||
| * | push recent changes | zotlabs | 2018-11-19 | 3 | -2/+6 |
| | | |||||
* | | fix call to undefined function | Mario Vavti | 2018-11-21 | 1 | -1/+1 |
| | | | | | | (cherry picked from commit 0bba9482dfbcc0fd8bea880ac3820548281ecfc2) | ||||
* | | Revert "Fix return on wrong sotred in Content-Length size for full size photos" | Mario | 2018-11-19 | 1 | -4/+2 |
| | | | | | | This reverts commit 6010b5c6198bf49c39029a657443b5bf1be8b408 | ||||
* | | Revert "Add filesize for streaming content" | Mario | 2018-11-19 | 1 | -1/+0 |
| | | | | | | This reverts commit 238a616292ad5c6e7be97a4dd763a302729abf80 | ||||
* | | fix typo which prevented propagation of comments | Mario Vavti | 2018-11-18 | 1 | -1/+1 |
| | | |||||
* | | recalculate photo filesize when rotating an image | Mario Vavti | 2018-11-17 | 1 | -10/+19 |
| | | | | | | (cherry picked from commit f15e32d0637fdf84de7cab43b558ec8a383d3cf5) | ||||
* | | Add filesize for streaming content | Max Kostikov | 2018-11-16 | 1 | -0/+1 |
| | | |||||
* | | Fix return on wrong sotred in Content-Length size for full size photos | Max Kostikov | 2018-11-16 | 1 | -2/+4 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-11-16 | 10 | -105/+43 |
|\| | |||||
| * | datetime_convert wrong args | zotlabs | 2018-11-15 | 1 | -1/+1 |
| | | |||||
| * | more work on the mid/uuid conversion | zotlabs | 2018-11-15 | 1 | -17/+19 |
| | | |||||
| * | add item.uuid to relevant places | zotlabs | 2018-11-15 | 4 | -19/+16 |
| | | |||||
| * | mid -> uuid conversions for basic reactions | zotlabs | 2018-11-15 | 2 | -3/+7 |
| | | |||||
| * | remove checkjs and nojs | zotlabs | 2018-11-15 | 2 | -65/+0 |
| | | |||||
* | | fix update 1228 | Mario Vavti | 2018-11-15 | 1 | -1/+0 |
|/ | |||||
* | separate by network | zotlabs | 2018-11-14 | 1 | -0/+1 |
| | |||||
* | encrypted header issue | zotlabs | 2018-11-14 | 1 | -1/+1 |
| | |||||
* | extra logging | zotlabs | 2018-11-14 | 1 | -0/+4 |
| | |||||
* | fix dreport link | zotlabs | 2018-11-14 | 1 | -2/+5 |
| | |||||
* | Merge branch 'master' into zvi | zotlabs | 2018-11-14 | 2 | -10/+11 |
|\ | |||||
| * | Merge branch 'patch-20181113b' into 'dev' | Mario | 2018-11-14 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395 | ||||
| | * | Fix double escaping after xss fix | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2018-11-14 | 1 | -8/+9 |
| |\ \ | | |/ | |/| | | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393 | ||||
| | * | Update Photo.php | Max Kostikov | 2018-11-13 | 1 | -4/+4 |
| | | | |||||
| | * | Remove uneccessary include/photos.php | Max Kostikov | 2018-11-13 | 1 | -1/+0 |
| | | | |||||
| | * | Text formatting in Photo.php | Max Kostikov | 2018-11-13 | 1 | -2/+2 |
| | | | |||||
| | * | Replace fetch_image_from_url() with z_fetch_url() | Max Kostikov | 2018-11-13 | 1 | -6/+8 |
| | | | |||||
* | | | db updates for zot6 | zotlabs | 2018-11-14 | 3 | -0/+145 |
| | | | |||||
* | | | Merge branch 'master' into zvi | zotlabs | 2018-11-13 | 4 | -21/+44 |
|\| | | |||||
| * | | Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ↵ | DM42.Net (Matt Dent) | 2018-11-13 | 2 | -5/+15 |
| |\ \ | | | | | | | | | | | | | to search xss and Superblock fix. | ||||
| | * | | xss in search | zotlabs | 2018-11-13 | 1 | -3/+3 |
| | | | | |||||
| | * | | enotify::format hook for superblock | zotlabs | 2018-11-12 | 1 | -2/+12 |
| | | | | |||||
| * | | | Revert "Replace fetch_image_from_url() with z_fetch_url()" | Max Kostikov | 2018-11-13 | 1 | -9/+6 |
| | | | | | | | | | | | | This reverts commit 6375f2d73a0c314e8de12071f1e604e59d8c76de | ||||
| * | | | Replace fetch_image_from_url() with z_fetch_url() | Max Kostikov | 2018-11-13 | 1 | -6/+9 |
| | |/ | |/| | |||||
| * | | Preserve photo modification date | Max Kostikov | 2018-11-10 | 1 | -4/+8 |
| | | | |||||
| * | | Remove unnecessary Zulu timezone mention | Max Kostikov | 2018-11-10 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed timezone conversion | Max Kostikov | 2018-11-09 | 1 | -4/+4 |
| | | | |||||
| * | | Correct "Content-Length:" calculation added | Max Kostikov | 2018-11-08 | 1 | -1/+1 |
| | | | |||||
| * | | $data only contains the link to the image if the image is in os storage. The ↵ | Mario Vavti | 2018-11-08 | 1 | -1/+2 |
| | | | | | | | | | | | | size is calculatet wrong in this case and the download fails. rely on filesize from the db for content-length | ||||
| * | | Disable image caching if personal or group permissions enabled | Max Kostikov | 2018-11-07 | 1 | -6/+6 |
| | | | |||||
| * | | Added `If-Modified-Since` header support for better image caching and fixed ↵ | Max Kostikov | 2018-11-07 | 1 | -6/+14 |
| |/ | | | | | | | absent 404 for photos | ||||
* | | item uuid changes | zotlabs | 2018-11-12 | 1 | -1/+3 |
| | | |||||
* | | dreport updates | zotlabs | 2018-11-12 | 3 | -9/+102 |
| | | |||||
* | | translate zot message packets to zot6 for delivery | zotlabs | 2018-11-11 | 1 | -12/+35 |
| | | |||||
* | | more z6 debugging | zotlabs | 2018-11-11 | 3 | -2/+9 |
| | | |||||
* | | add zot6 delivery method | zotlabs | 2018-11-08 | 1 | -0/+1 |
| | | |||||
* | | begin native summary support | zotlabs | 2018-11-08 | 1 | -1/+23 |
| | |