aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* more notifications fixesMario Vavti2018-12-031-4/+4
| | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e)
* Merge branch 'photocache' into 'dev'M. Dent2018-12-023-32/+111
|\ | | | | | | | | 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
| |
| * 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
| | | | | | (cherry picked from commit a3ba7f0788705a6ebee57433e80712b282b0e784)
* | 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 ↵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
* | Merge branch 'pg-fixes' into 'dev'M. Dent2018-11-281-2/+2
|\ \ | | | | | | | | | | | | fix db upgrade 1228 for postgres See merge request hubzilla/core!1403
| * | 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
| | | | | | (cherry picked from commit 0bba9482dfbcc0fd8bea880ac3820548281ecfc2)
* | 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
| |
* | 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
| |\ | | | | | | | | | | | | 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
| | |
* | | db updates for zot6zotlabs2018-11-143-0/+145
| | |
* | | Merge branch 'master' into zvizotlabs2018-11-134-21/+44
|\| |