Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'unfriend_delete_posts_bug' into 'dev' | Mario | 2019-05-03 | 3 | -2/+70 | |
|\ \ | | | | | | | | | | | | | Unfriend delete posts bug See merge request hubzilla/core!1624 | |||||
| * | | emojireaction compat | zotlabs | 2019-05-02 | 2 | -0/+12 | |
| | | | ||||||
| * | | move apschema to core to use for emojiReaction mapping for zot6 | zotlabs | 2019-05-02 | 2 | -2/+58 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-02 | 17 | -52/+935 | |
|\ \ \ | | |/ | |/| | | | | # Conflicts: # Zotlabs/Lib/ThreadItem.php | |||||
| * | | Revert "Merge branch 'dev' into 'dev'" | Max Kostikov | 2019-05-02 | 1 | -1/+1 | |
| | | | | | | | | | This reverts merge request !1620 | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-05-02 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | | | | | | | | | Check if 'reply on comment' enabled for this profile See merge request hubzilla/core!1620 | |||||
| * \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-02 | 1 | -0/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add Zap threads support See merge request hubzilla/core!1619 | |||||
| * \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-01 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add AS threaded comments support See merge request hubzilla/core!1618 | |||||
| * | | | | | 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 | |||||
| * | | | | | | 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' into 'dev' | Mario | 2019-05-01 | 3 | -12/+16 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614 | |||||
| * | | | | | | | 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 | 4 | -4/+45 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-29 | 4 | -5/+109 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | Add jot videos inline and with poster if possible See merge request hubzilla/core!1613 | |||||
| | * | | | | | | event attachments still weren't being delivered to zot6 | zotlabs | 2019-04-28 | 1 | -2/+9 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-28 | 2 | -13/+8 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | 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 | 3 | -7/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | import/export zot6 hublocs+xchans | Zot | 2019-04-26 | 1 | -6/+41 | |
| | | | | | | | | | ||||||
| * | | | | | | | | hubloc confusion in magic auth | Zot | 2019-04-25 | 3 | -7/+29 | |
| | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | 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 | |||||
| * | | | | | | | | 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 | |||||
| * | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | | 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 | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | 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 | 5 | -72/+152 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | 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 | 3 | -5/+803 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | / | Add check if threads are enabled globally | Max Kostikov | 2019-05-02 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Check if 'reply on comment' enabled for this profile | Max Kostikov | 2019-05-02 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Add Zap threads support | Max Kostikov | 2019-05-02 | 1 | -0/+1 | |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |