Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'unfriend_delete_posts_bug' into 'dev' | Mario | 2019-05-03 | 2 | -0/+64 | |
|\ | ||||||
| * | emojireaction compat | zotlabs | 2019-05-02 | 1 | -0/+8 | |
| * | move apschema to core to use for emojiReaction mapping for zot6 | zotlabs | 2019-05-02 | 1 | -0/+56 | |
* | | Update Item.php | Max Kostikov | 2019-05-01 | 1 | -9/+5 | |
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-01 | 2 | -7/+7 | |
|\ \ | ||||||
| * | | Fix missprint | Max Kostikov | 2019-05-01 | 1 | -1/+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 | |
* | | | 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 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | 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' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-28 | 2 | -13/+8 | |
| |\ \ | ||||||
* | \ \ | Merge branch 'dev' into 'dev' | Mario | 2019-05-01 | 2 | -7/+11 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Add displaying support for threaded comments | Max Kostikov | 2019-04-30 | 1 | -1/+1 | |
| * | | | Add initial threaded comments support | Max Kostikov | 2019-04-29 | 1 | -6/+10 | |
* | | | | 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 | 3 | -3/+44 | |
* | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-29 | 3 | -3/+100 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-04-28 | 1 | -11/+7 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | 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 | |
| | * | | | import/export zot6 hublocs+xchans | zotlabs | 2019-04-26 | 1 | -6/+41 | |
| | * | | | hubloc confusion during magic auth where hublocs with more than one network m... | zotlabs | 2019-04-24 | 2 | -6/+24 | |
* | | | | | 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 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | 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 | Max Kostikov | 2019-04-27 | 1 | -2/+1 | |
* | | | import/export zot6 hublocs+xchans | Zot | 2019-04-26 | 1 | -6/+41 | |
* | | | hubloc confusion in magic auth | Zot | 2019-04-25 | 2 | -6/+24 | |
| |/ |/| | ||||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-04-24 | 1 | -14/+21 | |
|\| | ||||||
| * | Optimize cached photos processing | Max Kostikov | 2019-04-24 | 1 | -11/+13 | |
| * | Add modified date in Etag hash calculation | Max Kostikov | 2019-04-24 | 1 | -3/+8 | |
* | | 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 update button | Max Kostikov | 2019-04-19 | 1 | -0/+1 | |
* | | | 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 | Max Kostikov | 2019-04-19 | 1 | -4/+30 | |
* | | | 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 | zotlabs | 2019-04-18 | 1 | -1/+1 | |
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-19 | 1 | -30/+13 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Update Photo.php | Max Kostikov | 2019-04-18 | 1 | -1/+1 |