aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into zvizotlabs2018-11-142-10/+11
|\
| * Merge branch 'patch-20181113b' into 'dev'Mario2018-11-141-2/+2
| |\
| | * Fix double escaping after xss fixDM42.Net (Matt Dent)2018-11-131-2/+2
| * | Merge branch 'dev' into 'dev'Mario2018-11-141-8/+9
| |\ \ | | |/ | |/|
| | * Update Photo.phpMax Kostikov2018-11-131-4/+4
| | * Remove uneccessary include/photos.php Max Kostikov2018-11-131-1/+0
| | * Text formatting in Photo.phpMax Kostikov2018-11-131-2/+2
| | * Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+8
* | | Merge branch 'master' into zvizotlabs2018-11-133-19/+32
|\| |
| * | Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ...DM42.Net (Matt Dent)2018-11-131-3/+3
| |\ \
| | * | xss in searchzotlabs2018-11-131-3/+3
| * | | Revert "Replace fetch_image_from_url() with z_fetch_url()"Max Kostikov2018-11-131-9/+6
| * | | Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+9
| | |/ | |/|
| * | Preserve photo modification dateMax Kostikov2018-11-101-4/+8
| * | Remove unnecessary Zulu timezone mentionMax Kostikov2018-11-101-1/+1
| * | Fixed timezone conversionMax Kostikov2018-11-091-4/+4
| * | Correct "Content-Length:" calculation addedMax Kostikov2018-11-081-1/+1
| * | $data only contains the link to the image if the image is in os storage. The ...Mario Vavti2018-11-081-1/+2
| * | Disable image caching if personal or group permissions enabledMax Kostikov2018-11-071-6/+6
| * | Added `If-Modified-Since` header support for better image caching and fixed a...Max Kostikov2018-11-071-6/+14
| |/
* | item uuid changeszotlabs2018-11-121-1/+3
* | dreport updateszotlabs2018-11-121-5/+15
* | more z6 debuggingzotlabs2018-11-111-0/+5
* | begin native summary supportzotlabs2018-11-081-1/+23
* | refresh packetszotlabs2018-11-081-0/+6
* | Merge branch 'master' into zvizotlabs2018-11-073-17/+27
|\|
| * Revert "remove 'Expiries' HTTP header"Max Kostikov2018-11-071-1/+2
| * remove 'Expiries' HTTP header Max Kostikov2018-11-061-2/+1
| * Update Photo.phpMax Kostikov2018-11-061-2/+2
| * Update Photo.phpMax Kostikov2018-11-061-4/+2
| * Update Photo.phpMax Kostikov2018-11-061-2/+3
| * 'Last-Modified' and 'Content-Length' HTTP headers added for better image cachingMax Kostikov2018-11-061-9/+18
| * Update Photo.phpMax Kostikov2018-11-051-1/+1
| * Use modern get_config() syntaxMax Kostikov2018-11-051-4/+2
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-052-11/+36
| |\
| * | more fixes for forum notifications handling: do not count likes/dislikes if l...Mario Vavti2018-11-032-2/+6
* | | this is brutalzotlabs2018-11-061-0/+44
| |/ |/|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-041-1/+6
|\|
| * Update Linkinfo.phpMax Kostikov2018-11-031-1/+1
| * Update Linkinfo.phpMax Kostikov2018-11-031-1/+1
| * Update Linkinfo.phpMax Kostikov2018-11-031-4/+4
| * Update Linkinfo.phpMax Kostikov2018-11-021-2/+2
| * more precise codepage detectionMax Kostikov2018-11-021-3/+5
| * Workaround for incorrect ISO-8859-5 encoded content conversionMax Kostikov2018-11-021-2/+5
* | z6 updates to owa, linkinfo improved image detectionzotlabs2018-11-042-11/+36
|/
* yet another blueimp vulnerability. Move to composer.Mike Macgirvin2018-10-311-3/+3
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-10-302-12/+27
|\
| * fix forum ping results - the term query requires xchan_name instead of xchan_...Mario Vavti2018-10-291-4/+3
| * fix issues with forum handling in mod network and ping. also some code cleanup.Mario Vavti2018-10-272-10/+24
| * notifications: fix unseen forum countMario Vavti2018-10-261-6/+8