aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-20181214a' into 'dev'Mario2018-12-161-2/+10
|\
| * Add return if no local_channel()DM42.Net (Matt Dent)2018-12-151-1/+3
| * ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.DM42.Net (Matt Dent)2018-12-141-2/+8
* | Update OAuth2Storage.php - fix email retrieval in getUserPascal Deklerck2018-12-151-1/+1
* | Merge branch 'patch-20181214d' into 'dev'Mario2018-12-153-2/+22
|\ \
| * | Fix syntax errorDM42.Net (Matt Dent)2018-12-142-2/+2
| * | Make Affinity Slider (optionally) 'sticky' across page loads. (default is cur...DM42.Net (Matt Dent)2018-12-143-2/+22
| |/
* / fix wiki preview issue with hyperlinksMario Vavti2018-12-151-2/+2
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-143-30/+47
|\
| * regression: the ability to order apps messed up since adding pinned apps to t...zotlabs2018-12-123-30/+47
* | 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-033-0/+12
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-038-50/+142
|\| |
| * | more notifications fixesMario Vavti2018-12-031-4/+4
| * | Merge branch 'photocache' into 'dev'M. Dent2018-12-023-32/+111
| |\|
| | * 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
| | * Add photo cache cleanupMax Kostikov2018-11-291-0/+23
| | * Update database with expires field for photoMax Kostikov2018-11-291-0/+32
| * | fallback to url if we have not got an addrMario Vavti2018-12-021-1/+1
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-013-1/+17
| |\ \ | | |/ | |/|
| * | Merge branch 'pg-fixes' into 'dev'M. Dent2018-11-281-2/+2
| |\ \
| | * | fix db upgrade 1228 for postgresMario2018-11-221-2/+2
| * | | 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-231-1/+1
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'mike/master' into devMario2018-11-231-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario2018-11-222-1/+4
| |\ \ \ \
| * | | | | fix call to undefined functionMario Vavti2018-11-211-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
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-1610-105/+43
| |\ \ \ \ \
| * | | | | | fix update 1228Mario Vavti2018-11-151-1/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 06:18:29 +0000