Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix default values for affinity tool and other information which could be ↵ | zotlabs | 2018-12-17 | 3 | -11/+32 |
| | | | | lost when approving a connection without the entire form provided by connedit. | ||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-13 | 2 | -17/+23 |
|\ | |||||
| * | Merge branch 'photo-hook' into 'dev' | M. Dent | 2018-12-10 | 1 | -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 Vavti | 2018-12-10 | 1 | -2/+11 |
| | | | | | | | | | | | | variable which resultet in a javascript error | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-10 | 3 | -3/+23 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-06 | 1 | -2/+1 |
| |\ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-12-04 | 1 | -15/+12 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'photocache' into 'dev' | Mario | 2018-12-04 | 1 | -15/+12 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Less dependence on cache logic See merge request hubzilla/core!1417 | ||||
| | | * | | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | New logic for less dependence on cache logic | Max Kostikov | 2018-12-03 | 1 | -15/+12 |
| | | | | | | |||||
* | | | | | | regression: the ability to order apps messed up since adding pinned apps to ↵ | zotlabs | 2018-12-12 | 3 | -30/+47 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | the ordering | ||||
* | | | | | home notifications won't expand if there are more than 300 unseen network ↵ | zotlabs | 2018-12-09 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | notifications ahead of them. | ||||
* | | | | | rmagic discovery for z6 networks | zotlabs | 2018-12-09 | 1 | -0/+18 |
| | | | | | |||||
* | | | | | total_identities restriction off by one | zotlabs | 2018-12-09 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | reset page title if article has no title. | zotlabs | 2018-12-05 | 1 | -2/+1 |
|/ / / | |||||
* | | | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 ↵ | zotlabs | 2018-12-03 | 3 | -0/+12 |
| | | | | | | | | | | | | version will be stored under $item['obj']['asld'] | ||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-03 | 8 | -50/+142 |
|\| | | |||||
| * | | more notifications fixes | Mario Vavti | 2018-12-03 | 1 | -4/+4 |
| | | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e) | ||||
| * | | Merge branch 'photocache' into 'dev' | M. Dent | 2018-12-02 | 3 | -32/+111 |
| |\| | | | | | | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412 | ||||
| | * | Better cache settings logic | Max Kostikov | 2018-11-29 | 1 | -4/+4 |
| | | | |||||
| | * | Code cleanup | Max Kostikov | 2018-11-29 | 1 | -3/+3 |
| | | | |||||
| | * | Add photo cache hooks | Max Kostikov | 2018-11-29 | 1 | -33/+57 |
| | | | |||||
| | * | Add photo cache cleanup | Max Kostikov | 2018-11-29 | 1 | -0/+23 |
| | | | |||||
| | * | Update database with expires field for photo | Max Kostikov | 2018-11-29 | 1 | -0/+32 |
| | | | |||||
| * | | fallback to url if we have not got an addr | Mario Vavti | 2018-12-02 | 1 | -1/+1 |
| | | | | | | | | | (cherry picked from commit a3ba7f0788705a6ebee57433e80712b282b0e784) | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-01 | 3 | -1/+17 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge branch 'pg-fixes' into 'dev' | M. Dent | 2018-11-28 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | fix db upgrade 1228 for postgres See merge request hubzilla/core!1403 | ||||
| | * | | fix db upgrade 1228 for postgres | Mario | 2018-11-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Do not store serialized pconfig value received via to Module/Pconfig.php | M. Dent | 2018-11-25 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario | 2018-11-23 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario | 2018-11-23 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario | 2018-11-22 | 2 | -1/+4 |
| |\ \ \ \ | |||||
| * | | | | | fix call to undefined function | Mario Vavti | 2018-11-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | (cherry picked from commit 0bba9482dfbcc0fd8bea880ac3820548281ecfc2) | ||||
| * | | | | | Revert "Fix return on wrong sotred in Content-Length size for full size photos" | Mario | 2018-11-19 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | This reverts commit 6010b5c6198bf49c39029a657443b5bf1be8b408 | ||||
| * | | | | | Revert "Add filesize for streaming content" | Mario | 2018-11-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | This reverts commit 238a616292ad5c6e7be97a4dd763a302729abf80 | ||||
| * | | | | | fix typo which prevented propagation of comments | Mario Vavti | 2018-11-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | recalculate photo filesize when rotating an image | Mario Vavti | 2018-11-17 | 1 | -10/+19 |
| | | | | | | | | | | | | | | | | | | (cherry picked from commit f15e32d0637fdf84de7cab43b558ec8a383d3cf5) | ||||
| * | | | | | Add filesize for streaming content | Max Kostikov | 2018-11-16 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix return on wrong sotred in Content-Length size for full size photos | Max Kostikov | 2018-11-16 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-11-16 | 10 | -105/+43 |
| |\ \ \ \ \ | |||||
| * | | | | | | fix update 1228 | Mario Vavti | 2018-11-15 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | more merging | zotlabs | 2018-12-03 | 1 | -9/+67 |
| | | | | | | | |||||
* | | | | | | | more work on z6 commenting | zotlabs | 2018-12-03 | 2 | -64/+253 |
| | | | | | | | |||||
* | | | | | | | fix generated plink | zotlabs | 2018-12-03 | 1 | -3/+3 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | allow notification filtering by name or addr | zotlabs | 2018-11-30 | 2 | -1/+8 |
| | | | | | | |||||
* | | | | | | prevent incompatible export files (osada/zap) from being imported. This is ↵ | zotlabs | 2018-11-27 | 1 | -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 missing | zotlabs | 2018-11-23 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | use uuid in file storage | zotlabs | 2018-11-22 | 1 | -1/+1 |
| |_|/ |/| | |