aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵zotlabs2018-12-123-30/+47
| | | | | | | | the ordering
* | 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… See merge request hubzilla/core!1425
| * | add photo_view_filter hook and fix minor issue with unset auto_save_draft ↵Mario Vavti2018-12-101-2/+11
| | | | | | | | | | | | variable which resultet in a javascript error
* | | 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 ↵zotlabs2018-12-091-2/+4
| | | | | | | | | | | | notifications ahead of them.
| * | 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
| |\ | | | | | | | | | | | | Less dependence on cache logic See merge request hubzilla/core!1417
| | * 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 ↵zotlabs2018-12-033-0/+12
| | | | | | | | | | | | version will be stored under $item['obj']['asld']
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-038-50/+142
|\| |
| * | 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
| |\ \ | | |/ | |/|
| * | 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
| |\ \ \
| * \ \ \ 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
| | | | | | | | | | | | | | | | | | (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
| |\ \ \ \ \
| * | | | | | 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 ↵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
* | | | | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 05:59:17 +0000