aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-013-1/+17
|\
| * 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
* | 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
|\ \ \ | | |/ | |/|
| * | Organization actor type was missingzotlabs2018-11-231-1/+1
* | | Merge remote-tracking branch 'mike/master' into devMario2018-11-231-1/+1
|\| | | |/ |/|
| * use uuid in file storagezotlabs2018-11-221-1/+1
* | Merge remote-tracking branch 'mike/master' into devMario2018-11-222-1/+4
|\|
| * 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
* | 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
|\|
| * 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
* | fix update 1228Mario Vavti2018-11-151-1/+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
| | * 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
* | | db updates for zot6zotlabs2018-11-143-0/+145
* | | Merge branch 'master' into zvizotlabs2018-11-134-21/+44
|\| |
| * | Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ...DM42.Net (Matt Dent)2018-11-132-5/+15
| |\ \
| | * | xss in searchzotlabs2018-11-131-3/+3
| | * | enotify::format hook for superblockzotlabs2018-11-121-2/+12
| * | | Revert "Replace fetch_image_from_url() with z_fetch_url()"Max Kostikov2018-11-131-9/+6
| * | | Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+9
| | |/ | |/|
| * | Preserve photo modification dateMax Kostikov2018-11-101-4/+8
| * | Remove unnecessary Zulu timezone mentionMax Kostikov2018-11-101-1/+1
| * | Fixed timezone conversionMax Kostikov2018-11-091-4/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 03:54:34 +0000