aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'dev' of ../hz into devzotlabs2019-04-301-5/+33
| |\
| | * disable directory options when using suggestion mode and only return one page...zotlabs2019-04-301-2/+8
| | * fix suggestion ordering in directory modulezotlabs2019-04-301-3/+25
* | | Merge branch 'dev' into 'dev'Mario2019-05-017-13/+47
|\ \ \
| * | | 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' featureMax Kostikov2019-04-291-0/+8
| |/ / /
| * | | 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
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | update fix_system_urls() to handle zot6 hublocszotlabs2019-04-251-3/+4
| * | | | | | compound name warningzotlabs2019-04-241-1/+0
| * | | | | | hubloc confusion during magic auth where hublocs with more than one network m...zotlabs2019-04-246-28/+90
| * | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-2420-592/+1242
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' of ../hm into devzotlabs2019-04-181-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-182-12/+6
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-162-12/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-15156-14399/+42049
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | calendar merge: d&d support and some minor cleanup and fixesMario Vavti2019-04-293-39/+91
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'sql_fixes' into 'dev'Max Kostikov2019-04-282-12/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | improve channel date queryMario Vavti2019-04-271-11/+7
| * | | | | | | | | | possible sql performance improvementMario Vavti2019-04-271-1/+1