aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'replyto_fixes' into 'dev'Mario2019-05-032-4/+4
|\ \
| * | more provide xchan_url if there is no xchan_addrMario Vavti2019-05-021-2/+2
| * | provide xchan_url if there is no xchan_addrMario Vavti2019-05-022-2/+2
* | | Merge branch 'dev' into 'dev'Mario2019-05-030-0/+0
|\ \ \
| * \ \ Merge branch 'dev' of ../hz into devzotlabs2019-05-022-0/+12
| |\ \ \
| * \ \ \ Merge branch 'dev' of /home/macgirvin/hz into devzotlabs2019-05-023-3/+59
| |\ \ \ \
* | \ \ \ \ Merge branch 'unfriend_delete_posts_bug' into 'dev'Mario2019-05-035-6/+91
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | when removed items for unfriended connections, check if the parent has been r...zotlabs2019-05-021-3/+20
| | |_|/ / | |/| | |
| * | | | emojireaction compatzotlabs2019-05-022-0/+12
| | |/ / | |/| |
| * | | move apschema to core to use for emojiReaction mapping for zot6zotlabs2019-05-023-3/+59
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-021-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-02134-4456/+4572
| |\ \ \ | |/ / / |/| | |
* | | | Revert "Merge branch 'dev' into 'dev'"Max Kostikov2019-05-021-1/+1
* | | | Merge branch 'dev' into 'dev'Mario2019-05-021-1/+1
|\ \ \ \
* | | | | calendar merge: use b64 encoded mid for plinkMario Vavti2019-05-021-1/+1
* | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-021-0/+1
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-05-011-2/+2
|\ \ \ \ \ \
* | | | | | | Update Item.phpMax Kostikov2019-05-011-9/+5
* | | | | | | Merge branch 'xmlify' into 'dev'Max Kostikov2019-05-011-2/+12
|\ \ \ \ \ \ \
| * | | | | | | address xmlify/unxmlify performance issueMario Vavti2019-05-011-2/+12
* | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-013-11/+8
|\ \ \ \ \ \ \ \
* | | | | | | | | 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
|\ \ \ \ \ \ \ \
* | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \