Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 vers... | zotlabs | 2018-12-03 | 3 | -0/+12 |
* | 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 |
| * | Merge branch 'photocache' into 'dev' | M. Dent | 2018-12-02 | 3 | -32/+111 |
| |\ | |||||
| | * | 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 |
| * | | 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 | 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 |
| * | | | | | Revert "Fix return on wrong sotred in Content-Length size for full size photos" | Mario | 2018-11-19 | 1 | -4/+2 |
| * | | | | | Revert "Add filesize for streaming content" | Mario | 2018-11-19 | 1 | -1/+0 |
| * | | | | | 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 |
| * | | | | | 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 to... | zotlabs | 2018-11-27 | 1 | -0/+9 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Organization actor type was missing | zotlabs | 2018-11-23 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | use uuid in file storage | zotlabs | 2018-11-22 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | no mention notifications from mastodon (and pleroma) | zotlabs | 2018-11-21 | 1 | -1/+1 |
* | | | use this form instead | zotlabs | 2018-11-19 | 1 | -2/+1 |
* | | | push recent changes | zotlabs | 2018-11-19 | 3 | -2/+6 |
| |/ |/| | |||||
* | | datetime_convert wrong args | zotlabs | 2018-11-15 | 1 | -1/+1 |
* | | more work on the mid/uuid conversion | zotlabs | 2018-11-15 | 1 | -17/+19 |
* | | add item.uuid to relevant places | zotlabs | 2018-11-15 | 4 | -19/+16 |
* | | mid -> uuid conversions for basic reactions | zotlabs | 2018-11-15 | 2 | -3/+7 |
* | | remove checkjs and nojs | zotlabs | 2018-11-15 | 2 | -65/+0 |
|/ | |||||
* | separate by network | zotlabs | 2018-11-14 | 1 | -0/+1 |
* | encrypted header issue | zotlabs | 2018-11-14 | 1 | -1/+1 |
* | extra logging | zotlabs | 2018-11-14 | 1 | -0/+4 |
* | fix dreport link | zotlabs | 2018-11-14 | 1 | -2/+5 |
* | 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 |
| |\ | |||||
| | * | 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 |
| |\ \ | | |/ | |/| | |||||
| | * | Update Photo.php | Max Kostikov | 2018-11-13 | 1 | -4/+4 |