| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-05-03 | 0 | -0/+0 |
| |\ | |||||
| | * | parent -> id | Mario Vavti | 2019-05-03 | 1 | -1/+1 |
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-05-03 | 14 | -82/+234 |
| |\| | |||||
| | * | Merge branch 'replyto_fixes' into 'dev' | Mario | 2019-05-03 | 2 | -4/+4 |
| | |\ | |||||
| | | * | 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 | 2 | -2/+2 |
| | * | | Merge branch 'dev' into 'dev' | Mario | 2019-05-03 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-05-02 | 2 | -0/+12 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'dev' of /home/macgirvin/hz into dev | zotlabs | 2019-05-02 | 3 | -3/+59 |
| | | |\ \ \ | |||||
| | * | \ \ \ | Merge branch 'unfriend_delete_posts_bug' into 'dev' | Mario | 2019-05-03 | 5 | -6/+91 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | | * | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-02 | 134 | -4456/+4572 |
| | | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Revert "Merge branch 'dev' into 'dev'" | Max Kostikov | 2019-05-02 | 1 | -1/+1 |
| | * | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | calendar merge: use b64 encoded mid for plink | Mario Vavti | 2019-05-02 | 1 | -1/+1 |
| | * | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-02 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-01 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update Item.php | Max Kostikov | 2019-05-01 | 1 | -9/+5 |
| | * | | | | | | | | | Merge branch 'xmlify' into 'dev' | Max Kostikov | 2019-05-01 | 1 | -2/+12 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | address xmlify/unxmlify performance issue | Mario Vavti | 2019-05-01 | 1 | -2/+12 |
| | * | | | | | | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-01 | 3 | -11/+8 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | 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 | 2 | -13/+13 |
| | * | | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-01 | 1 | -5/+33 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-30 | 1 | -5/+33 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into 'dev' | Mario | 2019-05-01 | 7 | -13/+47 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-28 | 1 | -2/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | 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 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-25 | 98 | -3778/+2880 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | calendar merge: d&d support and some minor cleanup and fixes | Mario Vavti | 2019-04-29 | 3 | -39/+91 |
| | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | | | | | * | | | | 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 |
| | | | | | | | | | | | | |/ / / / | |||||
| | | | | | | | | | | | | * / / / | Add threaded comments support | Max Kostikov | 2019-05-01 | 1 | -4/+11 |
| | | | | | | | | | | | |/ / / / | |||||
| | | | | | | | | | | | * | | | | Fix missprint | Max Kostikov | 2019-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | * | | | | Preserve parent_mid with threaded comments | Max Kostikov | 2019-05-01 | 1 | -4/+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 |
| | | | | | | | | | | |/ / / / | | | | | | | | | |/| | | | | |||||
| | | | | | | | | | * | | | | | 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 |
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |