aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Expand)AuthorAgeFilesLines
* fix wiki preview issue with hyperlinksMario Vavti2018-12-151-2/+2
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-142-18/+21
|\
| * regression: the ability to order apps messed up since adding pinned apps to t...zotlabs2018-12-122-18/+21
* | 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 var...Mario Vavti2018-12-101-2/+11
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-103-3/+23
|\ \ \ | | |/ | |/|
| * | home notifications won't expand if there are more than 300 unseen network not...zotlabs2018-12-091-2/+4
| * | rmagic discovery for z6 networkszotlabs2018-12-091-0/+18
| * | total_identities restriction off by onezotlabs2018-12-091-1/+1
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-061-2/+1
|\| | | |/ |/|
| * reset page title if article has no title.zotlabs2018-12-051-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
| |\
| | * 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
* | | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 vers...zotlabs2018-12-032-0/+6
* | | 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
| |\|
| | * 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
| * | | Revert "Add filesize for streaming content"Mario2018-11-191-1/+0
| * | | fix typo which prevented propagation of commentsMario Vavti2018-11-181-1/+1
| * | | recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
| * | | 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 to...zotlabs2018-11-271-0/+9
| |/ |/|
* | 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
| |\
| | * 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
| |\ \