aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-02134-4456/+4572
|\ | | | | | | # Conflicts: # Zotlabs/Lib/ThreadItem.php
| * Revert "Merge branch 'dev' into 'dev'"Max Kostikov2019-05-021-1/+1
| | | | | | This reverts merge request !1620
| * Merge branch 'dev' into 'dev'Mario2019-05-021-1/+1
| |\ | | | | | | | | | | | | Check if 'reply on comment' enabled for this profile See merge request hubzilla/core!1620
| * | calendar merge: use b64 encoded mid for plinkMario Vavti2019-05-021-1/+1
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-05-021-0/+1
| |\ \ | | | | | | | | | | | | | | | | Add Zap threads support See merge request hubzilla/core!1619
| * \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-05-011-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add AS threaded comments support See merge request hubzilla/core!1618
| * | | | 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
| * | | | | | 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
| * | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | 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 ↵zotlabs2019-04-246-28/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | may exist
| | * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible sql performance improvement See merge request hubzilla/core!1611
| | * | | | | | | | | | | | | | improve channel date queryMario Vavti2019-04-271-11/+7
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | possible sql performance improvementMario Vavti2019-04-271-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-271-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use goaway() base function See merge request hubzilla/core!1612
| * | | | | | | | | | | | | | | update changelogMario Vavti2019-04-261-0/+11
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-262-6/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import/export zot6 hublocs+xchans See merge request hubzilla/core!1610
| | * | | | | | | | | | | | | | import/export zot6 hublocs+xchansZot2019-04-262-6/+48
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-261-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to master) See merge request hubzilla/core!1609