aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-053-4/+11
|\| | |
| * | | Scroll back to initial low level commentMax Kostikov2019-05-051-2/+8
| * | | Use own variable for "Go to previous comment" hintMax Kostikov2019-05-051-1/+2
| * | | Force to add "go to previous comment" hintMax Kostikov2019-05-051-1/+1
| * | | Scroll back if more than one level in threadMax Kostikov2019-05-050-0/+0
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-051-2/+3
|\| | |
| * | | Threaded comments navigation elements fixesMax Kostikov2019-05-051-2/+3
|/ / /
* | | Allign arrows positionMax Kostikov2019-05-051-1/+1
* | | Merge branch 'dev' into 'dev'Mario2019-05-058-150/+222
|\ \ \
| * | | Add arrows to scroll between related commentsMax Kostikov2019-05-058-150/+222
|/ / /
* | | Merge branch 'db_update' into 'dev'Max Kostikov2019-05-044-9/+67
|\ \ \
| * | | port db update improvements from zapMario Vavti2019-05-034-9/+67
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-041-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | found another case where channel_r_photos could get referencedzotlabs2019-05-041-1/+1
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-041-1/+2
|\| | |
| * | | strip obsolete channel_(rw)_photos from channel sync packetszotlabs2019-05-031-1/+2
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-032-3123/+3206
|\ \ \ \ | |_|/ / |/| | |
| * | | Update hstrings.phpMax Kostikov2019-05-031-506/+518
| * | | Update hmessages.poMax Kostikov2019-05-031-2617/+2688
| * | | Merge branch 'revert-3528610a' into 'dev'Max Kostikov2019-05-031-1/+1
| |\ \ \
| | * | | Revert "Fix comment edit field expansion on reply on comment"Max Kostikov2019-05-031-1/+1
| |/ / /
| * | | Fix comment edit field expansion on reply on commentMax Kostikov2019-05-031-1/+1
* | | | Merge branch 'dev' into 'dev'Mario2019-05-031-3/+13
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| |\| |
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-05-0314-82/+234
| |\ \ \
| * | | | fix item queryzotlabs2019-05-021-1/+1
* | | | | update directory on cover photo changesMario Vavti2019-05-031-2/+7
| |_|/ / |/| | |
* | | | parent -> idMario Vavti2019-05-031-1/+1
| |/ / |/| |
* | | 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
|\ \ \ \ \ \ \ \ \