aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-021-0/+1
|\ | | | | | | | | Add Zap threads support See merge request hubzilla/core!1619
| * Add Zap threads supportMax Kostikov2019-05-021-0/+1
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-011-2/+2
|\| | | | | | | | | Add AS threaded comments support See merge request hubzilla/core!1618
| * Add threaded comments supportMax Kostikov2019-05-011-4/+11
| |
* | Update Item.phpMax Kostikov2019-05-011-9/+5
| |
* | Merge branch 'xmlify' into 'dev'Max Kostikov2019-05-011-2/+12
|\ \ | | | | | | | | | | | | address xmlify/unxmlify performance issue See merge request hubzilla/core!1616
| * | address xmlify/unxmlify performance issueMario Vavti2019-05-011-2/+12
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-013-11/+8
|\ \ \ | | |/ | |/| | | | | | | Use thr_parent tp handle reply on comment feature See merge request hubzilla/core!1617
| * | Fix missprintMax Kostikov2019-05-011-1/+1
| | |
| * | Preserve parent_mid with threaded commentsMax Kostikov2019-05-011-4/+1
| | |
| * | Use thr_parent for comment repliesMax Kostikov2019-05-011-6/+6
| | |
| * | Revert code to use thr_parent for comment repliesMax Kostikov2019-05-011-1/+1
| | |
* | | calendar merge: remove deprecated share variableMario Vavti2019-05-011-20/+2
| |/ |/|
* | calendar merge: fix event_xchan mixupMario Vavti2019-05-012-13/+13
| |
* | Merge branch 'dev' into 'dev'Mario2019-05-011-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 devzotlabs2019-04-301-5/+33
| |\ \
| | * | disable directory options when using suggestion mode and only return one ↵zotlabs2019-04-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | page (60 items) so that sorting works correctly
| | * | fix suggestion ordering in directory modulezotlabs2019-04-301-3/+25
| | | |
* | | | Merge branch 'dev' into 'dev'Mario2019-05-017-13/+47
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Add 'reply on comment' feature See merge request hubzilla/core!1614
| * | | Add 'reply on comment' codeMax Kostikov2019-05-011-0/+10
| | | |
| * | | Move JS to main moduleMax Kostikov2019-05-011-13/+1
| | | |
| * | | Remove 'doreply' JS functionMax Kostikov2019-04-301-9/+1
| | | |
| * | | Add JS 'doreply' functionMax Kostikov2019-04-301-0/+12
| | | |
| * | | Add "reply to" hint to submit buttonMax Kostikov2019-04-301-1/+1
| | | |
| * | | Fix add multiple icons on 'Submit' button when reply on commentMax Kostikov2019-04-301-1/+1
| | | |
| * | | Add displaying support for threaded commentsMax Kostikov2019-04-301-1/+1
| | | |
| * | | Merge branch 'cherry-pick-80ca2023' into 'dev'Max Kostikov2019-04-291-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add 'reply on comment' feature See merge request kostikov/core!1
| | * | | Add 'reply on comment' featureMax Kostikov2019-04-291-0/+8
| |/ / / | | | | | | | | (cherry picked from commit 80ca2023aa67ef7c0c43414acaf135e5748044b2)
| * | | Update main.jsMax Kostikov2019-04-291-3/+2
| | | |
| * | | Add 'reply to comment' processingMax Kostikov2019-04-291-0/+13
| | | |
| * | | Add 'reply to comment' buttonMax Kostikov2019-04-291-0/+5
| | | |
| * | | Add initial threaded comments supportMax Kostikov2019-04-291-6/+10
| | | |
| * | | Add variables for threaded comments supportMax Kostikov2019-04-291-5/+5
| | | |
| * | | Add initial threaded comment supportMax Kostikov2019-04-291-2/+5
| | | |
* | | | do not allow editing events that do not belong to usMario Vavti2019-04-302-1/+10
| | | |
* | | | select event by event_hash instead of item_idMario Vavti2019-04-305-12/+23
| | | |
* | | | remove loggingMario Vavti2019-04-301-3/+0
| | | |
* | | | calendar merge: implement single event editing UIMario Vavti2019-04-305-8/+71
| | | |
* | | | Merge branch 'dev' into 'dev'Mario2019-04-294-5/+109
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Add jot videos inline and with poster if possible See merge request hubzilla/core!1613
| * | | Merge branch 'dev' of ../hz into devzotlabs2019-04-281-2/+9
| |\ \ \ | | | |/ | | |/|
| | * | event attachments still weren't being delivered to zot6zotlabs2019-04-281-2/+9
| | | |
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-28102-3792/+2900
| | |\ \
| * | \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-282-12/+8
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'dev' of ../hz into devzotlabs2019-04-273-3/+100
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add jot videos inline and with poster if possiblezotlabs2019-04-273-3/+100
| | | | |
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-272-2/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-260-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' of ../hz into devzotlabs2019-04-262-6/+48
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | import/export zot6 hublocs+xchanszotlabs2019-04-262-6/+48
| | | | | | |
| * | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-2598-3778/+2880
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |