| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | don't do oembed processing on naked links and smarty lib cleanup. ported ↵ | Mario Vavti | 2019-05-13 | 2 | -36/+45 |
| | | | | | from zap. | ||||
| * | form security token for mod register ported from zap | Mario Vavti | 2019-05-13 | 1 | -4/+8 |
| | | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2019-05-11 | 1 | -10/+10 |
| |\ | | | | | | | | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered... See merge request hubzilla/core!1644 | ||||
| | * | use 'cache' flag to bbcode() on content destined for Zot6. We've seen ↵ | zotlabs | 2019-05-09 | 1 | -10/+10 |
| | | | | | | | | | rendered map HTML in a couple of places and these should never be rendered for outgoing content as they will only be purified on the other end. | ||||
| * | | typo | Mario Vavti | 2019-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | calendar merge: implement channel calendar import in cdav/calendar | Mario Vavti | 2019-05-10 | 4 | -20/+18 |
| |/ | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 3 | -21/+29 |
| |\ | | | | | | | | | 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 | 3 | -21/+29 |
| | | | |||||
| * | | 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 | 3 | -69/+57 |
| | | | |||||
| * | | another DB update to fix uid_mid index in item table and add xchan_photo_m ↵ | Mario Vavti | 2019-05-08 | 1 | -0/+38 |
| | | | | | | | | | index to xchan table | ||||
| * | | Channel update | Mario | 2019-05-08 | 1 | -0/+47 |
| |/ | |||||
| * | Update Photos.php | Max Kostikov | 2019-05-08 | 1 | -1/+1 |
| | | |||||
| * | Update PhotoDriver.php | Max Kostikov | 2019-05-08 | 1 | -13/+3 |
| | | |||||
| * | Respect thumbnail storage location on image editing | Max Kostikov | 2019-05-08 | 1 | -77/+35 |
| | | |||||
| * | Add photo usage detection if not exist on thumbnail save | Max Kostikov | 2019-05-08 | 1 | -0/+12 |
| | | |||||
| * | Use own variable for "Go to previous comment" hint | Max Kostikov | 2019-05-05 | 1 | -1/+2 |
| | | |||||
| * | Add arrows to scroll between related comments | Max Kostikov | 2019-05-05 | 1 | -7/+5 |
| | | |||||
| * | port db update improvements from zap | Mario Vavti | 2019-05-03 | 2 | -3/+51 |
| | | |||||
| * | update directory on cover photo changes | Mario Vavti | 2019-05-03 | 1 | -2/+7 |
| | | |||||
| * | Merge branch 'replyto_fixes' into 'dev' | Mario | 2019-05-03 | 1 | -3/+3 |
| |\ | | | | | | | | | provide xchan_url if there is no xchan_addr See merge request hubzilla/core!1622 | ||||
| | * | more provide xchan_url if there is no xchan_addr | Mario Vavti | 2019-05-02 | 1 | -2/+2 |
| | | | |||||
| | * | provide xchan_url if there is no xchan_addr | Mario Vavti | 2019-05-02 | 1 | -1/+1 |
| | | | |||||
| * | | 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 |
| | | |/ / / / / / | |/| | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |