| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | 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 | |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | | when removed items for unfriended connections, check if the parent has been r... | zotlabs | 2019-05-02 | 1 | -3/+20 | |
| | | |_|/ / | |/| | | | ||||||
| | * | | | | emojireaction compat | zotlabs | 2019-05-02 | 2 | -0/+12 | |
| | | |/ / | |/| | | ||||||
| | * | | | move apschema to core to use for emojiReaction mapping for zot6 | zotlabs | 2019-05-02 | 3 | -3/+59 | |
| * | | | | 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 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| | | * | | | | | | disable directory options when using suggestion mode and only return one page... | zotlabs | 2019-04-30 | 1 | -2/+8 | |
| | | * | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | | * | | | | | | | 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 m... | zotlabs | 2019-04-24 | 6 | -28/+90 | |
| | * | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |