Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | 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 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 |
| |\ \ | |||||
| | * | | 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 |
| * | | | 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 |
| * | | 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 a... | Max Kostikov | 2018-11-07 | 1 | -6/+14 |
| |/ | |||||
* | | 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 |
* | | refresh packets | zotlabs | 2018-11-08 | 2 | -3/+18 |
* | | Merge branch 'master' into zvi | zotlabs | 2018-11-07 | 5 | -32/+145 |
|\| | |||||
| * | Revert "remove 'Expiries' HTTP header" | Max Kostikov | 2018-11-07 | 1 | -1/+2 |
| * | remove 'Expiries' HTTP header | Max Kostikov | 2018-11-06 | 1 | -2/+1 |
| * | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -2/+2 |
| * | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -4/+2 |
| * | Update Photo.php | Max Kostikov | 2018-11-06 | 1 | -2/+3 |
| * | 'Last-Modified' and 'Content-Length' HTTP headers added for better image caching | Max Kostikov | 2018-11-06 | 1 | -9/+18 |
| * | Update Photo.php | Max Kostikov | 2018-11-05 | 1 | -1/+1 |
| * | Use modern get_config() syntax | Max Kostikov | 2018-11-05 | 1 | -4/+2 |
| * | Merge branch 'patch-20181028a' into 'dev' | Mario | 2018-11-05 | 2 | -15/+118 |
| |\ | |||||
| | * | Add tracking of deleted pconfig variables | M.Dent | 2018-10-29 | 1 | -4/+40 |
| | * | Fix to set update time in pconfig on update | M.Dent | 2018-10-28 | 1 | -3/+3 |
| | * | Add timestamp and associated logic to pconfig | M.Dent | 2018-10-28 | 1 | -12/+53 |
| | * | DB Updates to prep for pconfig timestamps. | M.Dent | 2018-10-28 | 1 | -0/+26 |
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-11-05 | 3 | -129/+319 |
| |\ \ | |||||
| * | | | more fixes for forum notifications handling: do not count likes/dislikes if l... | Mario Vavti | 2018-11-03 | 2 | -2/+6 |
* | | | | fix signatures | zotlabs | 2018-11-06 | 1 | -1/+1 |
* | | | | this is brutal | zotlabs | 2018-11-06 | 8 | -120/+369 |
* | | | | more zot6 work | zotlabs | 2018-11-05 | 2 | -18/+43 |
* | | | | z6 work | zotlabs | 2018-11-05 | 2 | -5/+7 |
| |/ / |/| | | |||||
* | | | debug zot6 discovery | zotlabs | 2018-11-04 | 1 | -118/+283 |