Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | disable directory options when using suggestion mode and only return one ↵ | zotlabs | 2019-04-30 | 1 | -2/+8 |
| | | | | | | page (60 items) so that sorting works correctly | ||||
* | fix suggestion ordering in directory module | zotlabs | 2019-04-30 | 1 | -3/+25 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-28 | 2 | -13/+8 |
|\ | |||||
| * | Merge branch 'sql_fixes' into 'dev' | Max Kostikov | 2019-04-28 | 1 | -11/+7 |
| |\ | | | | | | | | | | | | | possible sql performance improvement See merge request hubzilla/core!1611 | ||||
| | * | improve channel date query | Mario Vavti | 2019-04-27 | 1 | -11/+7 |
| | | | |||||
| * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-27 | 1 | -2/+1 |
| |\ \ | | |/ | |/| | | | | | | | Use goaway() base function See merge request hubzilla/core!1612 | ||||
| | * | Use goaway() base function | Max Kostikov | 2019-04-27 | 1 | -2/+1 |
| | | | |||||
| * | | import/export zot6 hublocs+xchans | Zot | 2019-04-26 | 1 | -6/+41 |
| | | | |||||
| * | | hubloc confusion in magic auth | Zot | 2019-04-25 | 2 | -6/+24 |
| | | | |||||
* | | | Add jot videos inline and with poster if possible | zotlabs | 2019-04-27 | 3 | -3/+100 |
| | | | |||||
* | | | import/export zot6 hublocs+xchans | zotlabs | 2019-04-26 | 1 | -6/+41 |
| | | | |||||
* | | | hubloc confusion during magic auth where hublocs with more than one network ↵ | zotlabs | 2019-04-24 | 2 | -6/+24 |
|/ / | | | | | | | may exist | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-04-24 | 1 | -14/+21 |
|\| | | | | | | | | | Add modification date in Etag hash calculation and optimize cached photos processing See merge request hubzilla/core!1607 | ||||
| * | Optimize cached photos processing | Max Kostikov | 2019-04-24 | 1 | -11/+13 |
| | | |||||
| * | Add modified date in Etag hash calculation | Max Kostikov | 2019-04-24 | 1 | -3/+8 |
| | | |||||
* | | calendar merge: bring back event categories | Mario Vavti | 2019-04-24 | 2 | -29/+31 |
| | | |||||
* | | resolve merge conflict | Mario Vavti | 2019-04-20 | 1 | -0/+1 |
|\ \ | |||||
| * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-19 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | Add translation to calendar event update button See merge request hubzilla/core!1601 | ||||
| | * | Add translation to update button | Max Kostikov | 2019-04-19 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'dev' into calendar_merge | Mario Vavti | 2019-04-19 | 1 | -4/+30 |
|\| | | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-04-19 | 1 | -4/+30 |
| |\| | | | | | | | | | | | | | Add remove profile photo button See merge request hubzilla/core!1598 | ||||
| | * | Add remove profile photo button | Max Kostikov | 2019-04-19 | 1 | -4/+30 |
| | | | |||||
* | | | provide location and description information | Mario Vavti | 2019-04-19 | 2 | -6/+13 |
| | | | |||||
* | | | provide link to source and some cleanup | Mario Vavti | 2019-04-19 | 3 | -140/+4 |
| | | | |||||
* | | | Merge branch 'dev' into calendar_merge | Mario Vavti | 2019-04-19 | 3 | -32/+15 |
|\| | | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-04-19 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | required php version not available but allowed to continue See merge request hubzilla/core!1597 | ||||
| | * | | required php version not available but allowed to continue | zotlabs | 2019-04-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-19 | 1 | -30/+13 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Precise cache related headers processing; remove duplicated code and optimization See merge request hubzilla/core!1596 | ||||
| | * | | Update Photo.php | Max Kostikov | 2019-04-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update Photo.php | Max Kostikov | 2019-04-18 | 1 | -2/+4 |
| | | | | |||||
| | * | | Implement ETag: header support for cache control | Max Kostikov | 2019-04-18 | 1 | -15/+14 |
| | | | | |||||
| | * | | Add 'must-revalidate' to Cache-control header for profile photos | Max Kostikov | 2019-04-17 | 1 | -1/+4 |
| | | | | |||||
| | * | | Precise 'Modified:' header processing if no profile photo added; remove ↵ | Max Kostikov | 2019-04-17 | 1 | -29/+8 |
| | | | | | | | | | | | | | | | | duplicated code | ||||
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-18 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | | | | add attachments to zot6 event objects, add zot6 to federated transports (webfinger) See merge request hubzilla/core!1593 | ||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-15 | 4 | -68/+118 |
| | |\ | |||||
| | * | | add attachments to zot6 event objects, add zot6 to federated transports ↵ | zotlabs | 2019-04-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | (webfinger) | ||||
* | | | | calendar merge initial commit | Mario Vavti | 2019-04-19 | 2 | -2/+788 |
|/ / / | |||||
* | / | Fix file path with filesystem storage | Max Kostikov | 2019-04-16 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-04-13 | 2 | -36/+54 |
|\ \ | | | | | | | | | | | | | Thumbnails storage in filesystem or database implementation See merge request hubzilla/core!1588 | ||||
| * | | Update photo usage only for thumbnails | Max Kostikov | 2019-04-13 | 1 | -1/+1 |
| | | | |||||
| * | | Save profile photo in filesystem or database; more precise modification time ↵ | Max Kostikov | 2019-04-12 | 1 | -21/+35 |
| | | | | | | | | | | | | processing | ||||
| * | | Save cover photo thumbnails in filesystem or database | Max Kostikov | 2019-04-12 | 1 | -15/+19 |
| | | | |||||
* | | | Fix wrong image resolution selection | Max Kostikov | 2019-04-10 | 1 | -2/+3 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-04-10 | 1 | -14/+34 |
|\| | | | | | | | | | Dev See merge request hubzilla/core!1586 | ||||
| * | missing endTime on Zot6 encoded events, optimise the url fetch of embedphotos | zotlabs | 2019-04-08 | 1 | -14/+34 |
| | | |||||
* | | Revert "Update htconfig.sample.php" | Max Kostikov | 2019-04-10 | 1 | -2/+6 |
| | | | | | | | | This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12 | ||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-04-07 | 1 | -21/+24 |
|\| | |||||
| * | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -5/+5 |
| | | |||||
| * | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -1/+1 |
| | | |||||
| * | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -3/+4 |
| | |