aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* review of last commitzotlabs2019-05-061-2/+2
* possible xchan (protocol) confusion in include/followzotlabs2019-05-061-5/+6
* found another case where channel_r_photos could get referencedzotlabs2019-05-041-1/+1
* strip obsolete channel_(rw)_photos from channel sync packetszotlabs2019-05-031-1/+2
* removing items from ex-connections turns out to be more complicated than orig...zotlabs2019-05-031-3/+13
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-05-030-0/+0
|\
| * parent -> idMario Vavti2019-05-031-1/+1
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-05-0314-82/+234
|\|
| * 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
| |\ \ \ \ \
| * \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-2598-3778/+2880
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | calendar merge: d&d support and some minor cleanup and fixesMario Vavti2019-04-293-39/+91
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * | | | Add check if threads are enabled globallyMax Kostikov2019-05-021-1/+1
| | | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | | | * / / / Check if 'reply on comment' enabled for this profileMax Kostikov2019-05-021-1/+1
| | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | | * / / / Add Zap threads supportMax Kostikov2019-05-021-0/+1
| | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * / / / Add threaded comments supportMax Kostikov2019-05-011-4/+11
| | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | Fix missprintMax Kostikov2019-05-011-1/+1
| | | | | | | | | | | * | | | Preserve parent_mid with threaded commentsMax Kostikov2019-05-011-4/+1