| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | 2 | -18/+21 |
| | |_|_|_|/ |/| | | | | | | | | | | | | | | 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 | 2 | -0/+6 |
| | | | | | | | | | | | | | version will be stored under $item['obj']['asld'] | ||||
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-03 | 3 | -42/+80 |
| |\| | | |||||
| | * | | Merge branch 'photocache' into 'dev' | M. Dent | 2018-12-02 | 1 | -32/+56 |
| | |\| | | | | | | | | | | | | | 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 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-01 | 2 | -1/+16 |
| | |\ \ | | |/ | |/| | |||||
| | * | | 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-22 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | fix generated plink | zotlabs | 2018-12-03 | 1 | -3/+3 |
| | |_|/ |/| | | |||||
| * | | | allow notification filtering by name or addr | zotlabs | 2018-11-30 | 1 | -1/+7 |
| | | | | |||||
| * | | | 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 | ||||
| * | | push recent changes | zotlabs | 2018-11-19 | 2 | -2/+2 |
| |/ | |||||
| * | more work on the mid/uuid conversion | zotlabs | 2018-11-15 | 1 | -17/+19 |
| | | |||||
| * | add item.uuid to relevant places | zotlabs | 2018-11-15 | 3 | -6/+12 |
| | | |||||
| * | mid -> uuid conversions for basic reactions | zotlabs | 2018-11-15 | 2 | -3/+7 |
| | | |||||
| * | remove checkjs and nojs | zotlabs | 2018-11-15 | 1 | -15/+0 |
| | | |||||
| * | Merge branch 'master' into zvi | zotlabs | 2018-11-14 | 2 | -10/+11 |
| |\ | |||||
| | * | Merge branch 'patch-20181113b' into 'dev' | Mario | 2018-11-14 | 1 | -2/+2 |
| | |\ | | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395 | ||||
| | | * | Fix double escaping after xss fix | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2018-11-14 | 1 | -8/+9 |
| | |\ \ | | |/ | |/| | | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393 | ||||
| | | * | Update Photo.php | Max Kostikov | 2018-11-13 | 1 | -4/+4 |
| | | | | |||||
| | | * | Remove uneccessary include/photos.php | Max Kostikov | 2018-11-13 | 1 | -1/+0 |
| | | | | |||||
| | | * | Text formatting in Photo.php | Max Kostikov | 2018-11-13 | 1 | -2/+2 |
| | | | | |||||
| | | * | Replace fetch_image_from_url() with z_fetch_url() | Max Kostikov | 2018-11-13 | 1 | -6/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into zvi | zotlabs | 2018-11-13 | 3 | -19/+32 |
| |\| | | |||||
| | * | | Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ↵ | DM42.Net (Matt Dent) | 2018-11-13 | 1 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | to search xss and Superblock fix. | ||||
| | | * | | xss in search | zotlabs | 2018-11-13 | 1 | -3/+3 |
| | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |