Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | be more precise with table selection | Mario Vavti | 2019-05-20 | 1 | -4/+4 |
| | |||||
* | calendar merge: initial commit for timezone support | Mario Vavti | 2019-05-20 | 2 | -67/+56 |
| | |||||
* | wiki: urlencode the entire share link | Mario Vavti | 2019-05-17 | 1 | -2/+2 |
| | |||||
* | use escape_tags() wiki headers | Mario Vavti | 2019-05-17 | 1 | -2/+2 |
| | |||||
* | calendar merge: only export events that will not break the importer. this ↵ | Mario Vavti | 2019-05-15 | 1 | -2/+3 |
| | | | | will probably dismiss some old experimental entries | ||||
* | add autocomplete js to calendar and fix issue with extended likes mid | Mario Vavti | 2019-05-14 | 1 | -3/+3 |
| | |||||
* | deal with privacy mentions in event descriptions | Mario Vavti | 2019-05-13 | 1 | -11/+35 |
| | |||||
* | calendar merge: cleanup | Mario Vavti | 2019-05-13 | 1 | -138/+9 |
| | |||||
* | form security token for mod register ported from zap | Mario Vavti | 2019-05-13 | 1 | -4/+8 |
| | |||||
* | calendar merge: implement channel calendar import in cdav/calendar | Mario Vavti | 2019-05-10 | 3 | -18/+15 |
| | |||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 1 | -18/+1 |
|\ | | | | | | | | | remove the caldav and event app and make calendar the default app See merge request hubzilla/core!1643 | ||||
| * | remove the caldav and event app and make calendar the default app | Mario Vavti | 2019-05-09 | 1 | -18/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | Add 'Create' button translation in CalDAV See merge request hubzilla/core!1642 | ||||
| * | Add 'Create' button translation | Max Kostikov | 2019-05-09 | 1 | -0/+1 |
| | | |||||
* | | calendar merge: cleanup and comment out some unused code | Mario Vavti | 2019-05-09 | 2 | -68/+56 |
|/ | |||||
* | Update Photos.php | Max Kostikov | 2019-05-08 | 1 | -1/+1 |
| | |||||
* | Respect thumbnail storage location on image editing | Max Kostikov | 2019-05-08 | 1 | -77/+35 |
| | |||||
* | port db update improvements from zap | Mario Vavti | 2019-05-03 | 1 | -2/+43 |
| | |||||
* | update directory on cover photo changes | Mario Vavti | 2019-05-03 | 1 | -2/+7 |
| | |||||
* | Merge branch 'unfriend_delete_posts_bug' into 'dev' | Mario | 2019-05-03 | 2 | -0/+64 |
|\ | | | | | | | | | Unfriend delete posts bug See merge request hubzilla/core!1624 | ||||
| * | emojireaction compat | zotlabs | 2019-05-02 | 1 | -0/+8 |
| | | |||||
| * | move apschema to core to use for emojiReaction mapping for zot6 | zotlabs | 2019-05-02 | 1 | -0/+56 |
| | | |||||
* | | Update Item.php | Max Kostikov | 2019-05-01 | 1 | -9/+5 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-01 | 2 | -7/+7 |
|\ \ | | | | | | | | | | | | | Use thr_parent tp handle reply on comment feature See merge request hubzilla/core!1617 | ||||
| * | | Fix missprint | Max Kostikov | 2019-05-01 | 1 | -1/+1 |
| | | | |||||
| * | | Use thr_parent for comment replies | Max Kostikov | 2019-05-01 | 1 | -6/+6 |
| | | | |||||
| * | | Revert code to use thr_parent for comment replies | Max Kostikov | 2019-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | calendar merge: remove deprecated share variable | Mario Vavti | 2019-05-01 | 1 | -20/+2 |
| | | | |||||
* | | | calendar merge: fix event_xchan mixup | Mario Vavti | 2019-05-01 | 1 | -6/+0 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-01 | 1 | -5/+33 |
|\ \ \ | | |/ | |/| | | | | | | | a couple of issues with the suggestions when viewing from the directory module See merge request hubzilla/core!1615 | ||||
| * | | 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 'dev' into 'dev' | Mario | 2019-05-01 | 2 | -7/+11 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614 | ||||
| * | | | Add displaying support for threaded comments | Max Kostikov | 2019-04-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add initial threaded comments support | Max Kostikov | 2019-04-29 | 1 | -6/+10 |
| | | | | |||||
* | | | | do not allow editing events that do not belong to us | Mario Vavti | 2019-04-30 | 1 | -0/+5 |
| | | | | |||||
* | | | | select event by event_hash instead of item_id | Mario Vavti | 2019-04-30 | 4 | -12/+19 |
| | | | | |||||
* | | | | calendar merge: implement single event editing UI | Mario Vavti | 2019-04-30 | 3 | -3/+44 |
| | | | | |||||
* | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-29 | 3 | -3/+100 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add jot videos inline and with poster if possible See merge request hubzilla/core!1613 | ||||
| * \ \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-28 | 1 | -11/+7 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-27 | 3 | -3/+100 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | 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 | ||||
* | | | | | calendar merge: d&d support and some minor cleanup and fixes | Mario Vavti | 2019-04-29 | 1 | -2/+11 |
| |_|/ / |/| | | | |||||
* | | | | 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 |
| | | |