Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into zvi | zotlabs | 2018-11-13 | 3 | -19/+32 |
|\ | |||||
| * | Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ↵ | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -3/+3 |
| |\ | | | | | | | | | | to search xss and Superblock fix. | ||||
| | * | xss in search | zotlabs | 2018-11-13 | 1 | -3/+3 |
| | | | |||||
| * | | 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 | 1 | -5/+15 |
| | | |||||
* | | more z6 debugging | zotlabs | 2018-11-11 | 1 | -0/+5 |
| | | |||||
* | | begin native summary support | zotlabs | 2018-11-08 | 1 | -1/+23 |
| | | |||||
* | | refresh packets | zotlabs | 2018-11-08 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into zvi | zotlabs | 2018-11-07 | 3 | -17/+27 |
|\| | |||||
| * | Revert "remove 'Expiries' HTTP header" | Max Kostikov | 2018-11-07 | 1 | -1/+2 |
| | | | | | | This reverts commit 40d9277ef38ef1200db59cd2f8c6b9e2a80bc332 | ||||
| * | 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 remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-11-05 | 2 | -11/+36 |
| |\ | |||||
| * | | more fixes for forum notifications handling: do not count likes/dislikes if ↵ | Mario Vavti | 2018-11-03 | 2 | -2/+6 |
| | | | | | | | | | | | | likes notifications are disabled and also do not show like activities when clicking a forum notification and like notifications are disabled | ||||
* | | | this is brutal | zotlabs | 2018-11-06 | 1 | -0/+44 |
| |/ |/| | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-11-04 | 1 | -1/+6 |
|\| | |||||
| * | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -1/+1 |
| | | |||||
| * | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -1/+1 |
| | | |||||
| * | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -4/+4 |
| | | |||||
| * | Update Linkinfo.php | Max Kostikov | 2018-11-02 | 1 | -2/+2 |
| | | |||||
| * | more precise codepage detection | Max Kostikov | 2018-11-02 | 1 | -3/+5 |
| | | |||||
| * | Workaround for incorrect ISO-8859-5 encoded content conversion | Max Kostikov | 2018-11-02 | 1 | -2/+5 |
| | | |||||
* | | z6 updates to owa, linkinfo improved image detection | zotlabs | 2018-11-04 | 2 | -11/+36 |
|/ | |||||
* | yet another blueimp vulnerability. Move to composer. | Mike Macgirvin | 2018-10-31 | 1 | -3/+3 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-10-30 | 2 | -12/+27 |
|\ | |||||
| * | fix forum ping results - the term query requires xchan_name instead of ↵ | Mario Vavti | 2018-10-29 | 1 | -4/+3 |
| | | | | | | | | xchan_hash. also improve the query itself - item_permission_sql() is redundant here since we always deal with local_channel() and use count(id) instead of sum(item_unseen) to get the unseen count | ||||
| * | fix issues with forum handling in mod network and ping. also some code cleanup. | Mario Vavti | 2018-10-27 | 2 | -10/+24 |
| | | |||||
| * | notifications: fix unseen forum count | Mario Vavti | 2018-10-26 | 1 | -6/+8 |
| | | |||||
* | | remove primary/clone counts from admin summary. The last checkins should fix ↵ | zotlabs | 2018-10-30 | 1 | -3/+1 |
|/ | | | | this count "eventually" but the information has little direct value and may require location information for a local channel to change before it is actually corrected. | ||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-24 | 1 | -2/+2 |
|\ | |||||
| * | Update Linkinfo.php | Max Kostikov | 2018-10-24 | 1 | -1/+1 |
| | | |||||
| * | Update Linkinfo.php | Max Kostikov | 2018-10-23 | 1 | -1/+1 |
| | | |||||
| * | Update Linkinfo.php | Max Kostikov | 2018-10-23 | 1 | -4/+2 |
| | | |||||
| * | Convert non UTF-8 content on link embeding | Max Kostikov | 2018-10-23 | 1 | -2/+4 |
| | | |||||
* | | refine stream filter and forum notification behaviour (mostly for ↵ | Mario Vavti | 2018-10-24 | 2 | -21/+31 |
| | | | | | | | | performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath. | ||||
* | | wrong var | Mario Vavti | 2018-10-24 | 1 | -1/+1 |
| | |