aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | more mergingzotlabs2018-12-031-9/+67
* | | | | | | more work on z6 commentingzotlabs2018-12-032-64/+253
* | | | | | | fix generated plinkzotlabs2018-12-031-3/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | allow notification filtering by name or addrzotlabs2018-11-302-1/+8
* | | | | | prevent incompatible export files (osada/zap) from being imported. This is to...zotlabs2018-11-271-0/+9
| |_|_|_|/ |/| | | |
* | | | | Organization actor type was missingzotlabs2018-11-231-1/+1
| |_|_|/ |/| | |
* | | | use uuid in file storagezotlabs2018-11-221-1/+1
| |_|/ |/| |
* | | no mention notifications from mastodon (and pleroma)zotlabs2018-11-211-1/+1
* | | use this form insteadzotlabs2018-11-191-2/+1
* | | push recent changeszotlabs2018-11-193-2/+6
| |/ |/|
* | datetime_convert wrong argszotlabs2018-11-151-1/+1
* | more work on the mid/uuid conversionzotlabs2018-11-151-17/+19
* | add item.uuid to relevant placeszotlabs2018-11-154-19/+16
* | mid -> uuid conversions for basic reactionszotlabs2018-11-152-3/+7
* | remove checkjs and nojszotlabs2018-11-152-65/+0
|/
* separate by networkzotlabs2018-11-141-0/+1
* encrypted header issuezotlabs2018-11-141-1/+1
* extra loggingzotlabs2018-11-141-0/+4
* fix dreport linkzotlabs2018-11-141-2/+5
* 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