| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | calendar merge: fix event_xchan mixup | Mario Vavti | 2019-05-01 | 2 | -13/+13 |
| | | |||||
| * | 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 | ||||
| | * | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-30 | 1 | -5/+33 |
| | |\ | |||||
| | | * | 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 | 7 | -13/+47 |
| |\ \ \ | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614 | ||||
| | * | | | Add 'reply on comment' code | Max Kostikov | 2019-05-01 | 1 | -0/+10 |
| | | | | | |||||
| | * | | | Move JS to main module | Max Kostikov | 2019-05-01 | 1 | -13/+1 |
| | | | | | |||||
| | * | | | Remove 'doreply' JS function | Max Kostikov | 2019-04-30 | 1 | -9/+1 |
| | | | | | |||||
| | * | | | Add JS 'doreply' function | Max Kostikov | 2019-04-30 | 1 | -0/+12 |
| | | | | | |||||
| | * | | | Add "reply to" hint to submit button | Max Kostikov | 2019-04-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix add multiple icons on 'Submit' button when reply on comment | Max Kostikov | 2019-04-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add displaying support for threaded comments | Max Kostikov | 2019-04-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'cherry-pick-80ca2023' into 'dev' | Max Kostikov | 2019-04-29 | 1 | -0/+8 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request kostikov/core!1 | ||||
| | | * | | | Add 'reply on comment' feature | Max Kostikov | 2019-04-29 | 1 | -0/+8 |
| | |/ / / | | | | | | | | | (cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2) | ||||
| | * | | | Update main.js | Max Kostikov | 2019-04-29 | 1 | -3/+2 |
| | | | | | |||||
| | * | | | Add 'reply to comment' processing | Max Kostikov | 2019-04-29 | 1 | -0/+13 |
| | | | | | |||||
| | * | | | Add 'reply to comment' button | Max Kostikov | 2019-04-29 | 1 | -0/+5 |
| | | | | | |||||
| | * | | | Add initial threaded comments support | Max Kostikov | 2019-04-29 | 1 | -6/+10 |
| | | | | | |||||
| | * | | | Add variables for threaded comments support | Max Kostikov | 2019-04-29 | 1 | -5/+5 |
| | | | | | |||||
| | * | | | Add initial threaded comment support | Max Kostikov | 2019-04-29 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | do not allow editing events that do not belong to us | Mario Vavti | 2019-04-30 | 2 | -1/+10 |
| | | | | | |||||
| * | | | | select event by event_hash instead of item_id | Mario Vavti | 2019-04-30 | 5 | -12/+23 |
| | | | | | |||||
| * | | | | remove logging | Mario Vavti | 2019-04-30 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | calendar merge: implement single event editing UI | Mario Vavti | 2019-04-30 | 5 | -8/+71 |
| | | | | | |||||
| * | | | | 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 | ||||
| | * | | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-28 | 1 | -2/+9 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | 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 | 102 | -3792/+2900 |
| | | |\ \ | |||||
| | * | \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-28 | 2 | -12/+8 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | | 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 |
| | | | | | | |||||
| | * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-27 | 2 | -2/+12 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-26 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-26 | 2 | -6/+48 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | | import/export zot6 hublocs+xchans | zotlabs | 2019-04-26 | 2 | -6/+48 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-25 | 98 | -3778/+2880 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | update fix_system_urls() to handle zot6 hublocs | zotlabs | 2019-04-25 | 1 | -3/+4 |
| | | | | | | | | |||||
| | * | | | | | | compound name warning | zotlabs | 2019-04-24 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | hubloc confusion during magic auth where hublocs with more than one network ↵ | zotlabs | 2019-04-24 | 6 | -28/+90 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | may exist | ||||
| | * | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-24 | 20 | -592/+1242 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'dev' of ../hm into dev | zotlabs | 2019-04-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-18 | 2 | -12/+6 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-16 | 2 | -12/+6 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-15 | 156 | -14399/+42049 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | calendar merge: d&d support and some minor cleanup and fixes | Mario Vavti | 2019-04-29 | 3 | -39/+91 |
| | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'sql_fixes' into 'dev' | Max Kostikov | 2019-04-28 | 2 | -12/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible sql performance improvement See merge request hubzilla/core!1611 | ||||
| | * | | | | | | | | | | improve channel date query | Mario Vavti | 2019-04-27 | 1 | -11/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | possible sql performance improvement | Mario Vavti | 2019-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-27 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | Use goaway() base function See merge request hubzilla/core!1612 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |