aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-132-17/+23
|\
| * Merge branch 'photo-hook' into 'dev'M. Dent2018-12-101-2/+11
| |\ | | | | | | | | | | | | add photo_view_filter hook and fix minor issue with unset auto_save_draft… See merge request hubzilla/core!1425
| | * add photo_view_filter hook and fix minor issue with unset auto_save_draft ↵Mario Vavti2018-12-101-2/+11
| | | | | | | | | | | | variable which resultet in a javascript error
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-103-3/+23
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-061-2/+1
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-12-041-15/+12
| |\ \ \
| | * \ \ Merge branch 'photocache' into 'dev'Mario2018-12-041-15/+12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Less dependence on cache logic See merge request hubzilla/core!1417
| | | * | | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | | | |
| | | * | | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | | | |
| | | * | | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | | | |
| | | * | | New logic for less dependence on cache logicMax Kostikov2018-12-031-15/+12
| | | | | |
* | | | | | regression: the ability to order apps messed up since adding pinned apps to ↵zotlabs2018-12-122-18/+21
| |_|_|_|/ |/| | | | | | | | | | | | | | the ordering
* | | | | home notifications won't expand if there are more than 300 unseen network ↵zotlabs2018-12-091-2/+4
| | | | | | | | | | | | | | | | | | | | notifications ahead of them.
* | | | | rmagic discovery for z6 networkszotlabs2018-12-091-0/+18
| | | | |
* | | | | total_identities restriction off by onezotlabs2018-12-091-1/+1
| |_|_|/ |/| | |
* | | | reset page title if article has no title.zotlabs2018-12-051-2/+1
|/ / /
* | | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 ↵zotlabs2018-12-032-0/+6
| | | | | | | | | | | | version will be stored under $item['obj']['asld']
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-033-42/+80
|\| |
| * | Merge branch 'photocache' into 'dev'M. Dent2018-12-021-32/+56
| |\| | | | | | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412
| | * Better cache settings logicMax Kostikov2018-11-291-4/+4
| | |
| | * Code cleanupMax Kostikov2018-11-291-3/+3
| | |
| | * Add photo cache hooksMax Kostikov2018-11-291-33/+57
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-012-1/+16
| |\ \ | | |/ | |/|
| * | Do not store serialized pconfig value received via to Module/Pconfig.phpM. Dent2018-11-251-0/+5
| | |
| * | Merge remote-tracking branch 'mike/master' into devMario2018-11-221-1/+1
| |\ \
| * | | Revert "Fix return on wrong sotred in Content-Length size for full size photos"Mario2018-11-191-4/+2
| | | | | | | | | | | | This reverts commit 6010b5c6198bf49c39029a657443b5bf1be8b408
| * | | Revert "Add filesize for streaming content"Mario2018-11-191-1/+0
| | | | | | | | | | | | This reverts commit 238a616292ad5c6e7be97a4dd763a302729abf80
| * | | fix typo which prevented propagation of commentsMario Vavti2018-11-181-1/+1
| | | |
| * | | recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
| | | | | | | | | | | | (cherry picked from commit f15e32d0637fdf84de7cab43b558ec8a383d3cf5)
| * | | Add filesize for streaming contentMax Kostikov2018-11-161-0/+1
| | | |
| * | | Fix return on wrong sotred in Content-Length size for full size photosMax Kostikov2018-11-161-2/+4
| | | |
* | | | fix generated plinkzotlabs2018-12-031-3/+3
| |_|/ |/| |
* | | allow notification filtering by name or addrzotlabs2018-11-301-1/+7
| | |
* | | prevent incompatible export files (osada/zap) from being imported. This is ↵zotlabs2018-11-271-0/+9
| |/ |/| | | | | to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
* | push recent changeszotlabs2018-11-192-2/+2
|/
* more work on the mid/uuid conversionzotlabs2018-11-151-17/+19
|
* add item.uuid to relevant placeszotlabs2018-11-153-6/+12
|
* mid -> uuid conversions for basic reactionszotlabs2018-11-152-3/+7
|
* remove checkjs and nojszotlabs2018-11-151-15/+0
|
* Merge branch 'master' into zvizotlabs2018-11-142-10/+11
|\
| * Merge branch 'patch-20181113b' into 'dev'Mario2018-11-141-2/+2
| |\ | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395
| | * Fix double escaping after xss fixDM42.Net (Matt Dent)2018-11-131-2/+2
| | |
| * | Merge branch 'dev' into 'dev'Mario2018-11-141-8/+9
| |\ \ | | |/ | |/| | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393
| | * 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
| |\ \ | | | | | | | | | | | | to search xss and Superblock fix.
| | * | xss in searchzotlabs2018-11-131-3/+3
| | | |