aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-05-081-6/+5
| |\| | | | | | | | | | | | | Replace own image URL in clonned channel posts See merge request hubzilla/core!1638
| | * Replace own image URL in clonned channel postsMax Kostikov2019-05-081-6/+5
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-05-082-14/+4
| |\| | | | | | | | | | | | | Change thumbnails processing logic on image edit See merge request hubzilla/core!1637
| | * Update Photos.phpMax Kostikov2019-05-081-1/+1
| | |
| | * Update PhotoDriver.phpMax Kostikov2019-05-081-13/+3
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-05-082-77/+47
| |\| | | | | | | | | | | | | Respect thumbnail storage location on image editing See merge request hubzilla/core!1636
| | * Respect thumbnail storage location on image editingMax Kostikov2019-05-081-77/+35
| | |
| | * Add photo usage detection if not exist on thumbnail saveMax Kostikov2019-05-081-0/+12
| | |
| * | Merge branch 'dev' into 'dev'Mario2019-05-061-7/+8
| |\ \ | | | | | | | | | | | | | | | | possible xchan confusion include/follow See merge request hubzilla/core!1635
| | * | review of last commitzotlabs2019-05-061-2/+2
| | | |
| | * | possible xchan (protocol) confusion in include/followzotlabs2019-05-061-5/+6
| | | |
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-061-1/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | Remove 'os_syspath' from direct 'photo' table update See merge request hubzilla/core!1634
| | * | Remove 'os_syspath' from direct 'photo' table updateMax Kostikov2019-05-061-1/+0
| | | |
| * | | Add system.filesystem_storage_thumbnails descriptionMax Kostikov2019-05-051-1/+2
| | | |
| * | | More precise scroll back to initial comment in threadMax Kostikov2019-05-051-8/+6
| | | |
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-053-4/+11
| |\| | | | | | | | | | | | | | | | | | Threaded comments usability imrovements See merge request hubzilla/core!1633
| | * | 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 fixes See merge request hubzilla/core!1632
| | * | 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 comments See merge request hubzilla/core!1629
| | * | 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 zap See merge request hubzilla/core!1628
| | * | 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 referenced See merge request hubzilla/core!1631
| | * | 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 packets See merge request hubzilla/core!1630
| | * | 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 Russian translation See merge request hubzilla/core!1627
| | * | 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" See merge request kostikov/core!1
| | | * | Revert "Fix comment edit field expansion on reply on comment"Max Kostikov2019-05-031-1/+1
| | |/ / | | | | | | | | | | | | This reverts commit 3528610a51df54e843a2f3d55c8b7d925fa2fac7
| | * | 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 originally envisioned See merge request hubzilla/core!1626
| | * | removing items from ex-connections turns out to be more complicated than ↵zotlabs2019-05-031-3/+13
| | | | | | | | | | | | | | | | originally envisioned
| | * | 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
| |\ \ | | | | | | | | | | | | | | | | provide xchan_url if there is no xchan_addr See merge request hubzilla/core!1622
| | * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | work on emoji reactions - sync with matching update to addons See merge request hubzilla/core!1623
| | * \ \ Merge branch 'dev' of ../hz into devzotlabs2019-05-022-0/+12
| | |\ \ \
| | * \ \ \ Merge branch 'dev' of /home/macgirvin/hz into devzotlabs2019-05-023-3/+59
| | |\ \ \ \