Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Mario | 2019-06-20 | 9 | -21/+32 |
|\ | | | | | | | | | changes to support direct messages in zot6 (set item.item_private = 2 when... See merge request hubzilla/core!1679 | ||||
| * | tweak to event title encoding to ensure it works with German, Russian, as ↵ | zotlabs | 2019-06-19 | 1 | -1/+1 |
| | | | | | | | | well as angle chars | ||||
| * | events: don't use htmlentities on local (hz) event titles as they are not ↵ | zotlabs | 2019-06-19 | 2 | -3/+4 |
| | | | | | | | | being used in textareas and umlauts for instance are getting mangled on the calendar display | ||||
| * | changes to support direct messages in zot6 (set item.item_private = 2 when ↵ | zotlabs | 2019-06-19 | 7 | -18/+28 |
| | | | | | | | | private mentions are used and federate with zot:directMessage attribute which aligns with litepub:directMessage) | ||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-19 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | Remove cached photo location directory on delete if empty See merge request hubzilla/core!1678 | ||||
| * | | Remove cached photo location directory on delete if empty | Max Kostikov | 2019-06-19 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Use html_entity_decode() for cached photo URL See merge request hubzilla/core!1677 | ||||
| * | | Use html_entity_decode() for cached photo URL | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Include Zot6 hubs in the Grid scope See merge request hubzilla/core!1676 | ||||
| * | | Update zid.php | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
| | | | |||||
| * | | Include Zot6 hubs in the Grid scope | Max Kostikov | 2019-06-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-18 | 4 | -13843/+15287 |
|\| | | | | | | | | | | | | | | Update German and Russian translations See merge request hubzilla/core!1674 | ||||
| * | | Update hstrings.php | Max Kostikov | 2019-06-18 | 1 | -13/+14 |
| | | | |||||
| * | | Update hmessages.po | Max Kostikov | 2019-06-18 | 1 | -551/+553 |
| | | | |||||
| * | | Update hstrings.php | Max Kostikov | 2019-06-18 | 1 | -2566/+2805 |
| | | | |||||
| * | | Update hmessages.po | Max Kostikov | 2019-06-18 | 1 | -10713/+11915 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-18 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Fix os_path replace for thumbnails See merge request hubzilla/core!1672 | ||||
| * | | Fix os_path replace for thumbnails | Max Kostikov | 2019-06-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-18 | 33 | -18085/+407 |
| |\ \ | |/ / |/| | | | | | | | | Dev See merge request kostikov/core!1 | ||||
* | | | Avoid to process original images using storeThumbnail | Max Kostikov | 2019-06-18 | 1 | -3/+7 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-18 | 3 | -3/+3 |
|\ \ \ | | |/ | |/| | | | | | | | minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671 | ||||
| * | | minor zot6 compatibility issues uncovered through daily use | zotlabs | 2019-06-17 | 3 | -3/+3 |
| | | | |||||
* | | | fix typo | Mario Vavti | 2019-06-18 | 1 | -2/+2 |
| | | | |||||
* | | | update composer libs | Mario Vavti | 2019-06-17 | 9 | -87/+125 |
| | | | |||||
* | | | changelog and version | Mario Vavti | 2019-06-17 | 2 | -1/+16 |
| | | | |||||
* | | | disable events module. it is now disfunctional | Mario Vavti | 2019-06-17 | 2 | -8/+6 |
| | | | |||||
* | | | remove old fullcalendar library | Mario Vavti | 2019-06-17 | 12 | -17676/+0 |
| | | | |||||
* | | | update feature set | Mario Vavti | 2019-06-17 | 2 | -15/+1 |
| | | | |||||
* | | | revisit mod cal | Mario Vavti | 2019-06-17 | 3 | -290/+247 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-15 | 5 | -6/+15 |
|\ \ \ | | |/ | |/| | | | | | | | Add signatures processing for private messages See merge request hubzilla/core!1670 | ||||
| * | | base64 encode message signature | Max Kostikov | 2019-06-15 | 1 | -1/+1 |
| | | | |||||
| * | | Add base64 decode if signature encoded | Max Kostikov | 2019-06-15 | 1 | -0/+3 |
| | | | |||||
| * | | Formatting | Max Kostikov | 2019-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | Add signature when private message displaying | Max Kostikov | 2019-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | Add signature when send private message | Max Kostikov | 2019-06-14 | 1 | -0/+1 |
| | | | |||||
| * | | Formatting | Max Kostikov | 2019-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -0/+4 |
| | | | |||||
| * | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -3/+2 |
| | | | |||||
| * | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -2/+4 |
|/ / | |||||
* | | fix mod cal regression | Mario Vavti | 2019-06-14 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-06-14 | 1 | -1/+3 |
|\| | | | | | | | | | zot6 protocol edge case See merge request hubzilla/core!1669 | ||||
| * | zot6 protocol edge case | zotlabs | 2019-06-13 | 1 | -1/+3 |
| | | |||||
* | | fix typo | Mario Vavti | 2019-06-14 | 1 | -1/+1 |
| | | |||||
* | | more work on linked item/resource deletion for photos and events, deprecate ↵ | Mario Vavti | 2019-06-13 | 4 | -75/+54 |
| | | | | | | | | the force flag in drop_item() and comment out goaway() in drop_item(). | ||||
* | | port delete fixes from zap | Mario Vavti | 2019-06-12 | 2 | -20/+25 |
| | | |||||
* | | more work on event item deletion | Mario Vavti | 2019-06-12 | 3 | -1/+49 |
| | | |||||
* | | initial support for deleting event items if an event is removed | Mario Vavti | 2019-06-12 | 1 | -3/+62 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-06-12 | 2 | -6/+8 |
|\| | | | | | | | | | attach sync issues See merge request hubzilla/core!1668 | ||||
| * | zot6 deletion issue | zotlabs | 2019-06-11 | 1 | -1/+1 |
| | | |||||
| * | attach sync issues | zotlabs | 2019-06-11 | 1 | -5/+7 |
| | |