Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Update Photos.php | Max Kostikov | 2019-05-08 | 1 | -1/+1 | |
| | | ||||||
| * | Update PhotoDriver.php | Max Kostikov | 2019-05-08 | 1 | -13/+3 | |
| | | ||||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 2 | -77/+47 | |
|\| | | | | | | | | | Respect thumbnail storage location on image editing See merge request hubzilla/core!1636 | |||||
| * | Respect thumbnail storage location on image editing | Max Kostikov | 2019-05-08 | 1 | -77/+35 | |
| | | ||||||
| * | Add photo usage detection if not exist on thumbnail save | Max Kostikov | 2019-05-08 | 1 | -0/+12 | |
| | | ||||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-05-06 | 1 | -7/+8 | |
|\ \ | | | | | | | | | | | | | possible xchan confusion include/follow See merge request hubzilla/core!1635 | |||||
| * | | review of last commit | zotlabs | 2019-05-06 | 1 | -2/+2 | |
| | | | ||||||
| * | | possible xchan (protocol) confusion in include/follow | zotlabs | 2019-05-06 | 1 | -5/+6 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-06 | 1 | -1/+0 | |
|\ \ \ | | |/ | |/| | | | | | | | Remove 'os_syspath' from direct 'photo' table update See merge request hubzilla/core!1634 | |||||
| * | | Remove 'os_syspath' from direct 'photo' table update | Max Kostikov | 2019-05-06 | 1 | -1/+0 | |
| | | | ||||||
* | | | Add system.filesystem_storage_thumbnails description | Max Kostikov | 2019-05-05 | 1 | -1/+2 | |
| | | | ||||||
* | | | More precise scroll back to initial comment in thread | Max Kostikov | 2019-05-05 | 1 | -8/+6 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-05 | 3 | -4/+11 | |
|\| | | | | | | | | | | | | | | Threaded comments usability imrovements See merge request hubzilla/core!1633 | |||||
| * | | Scroll back to initial low level comment | Max Kostikov | 2019-05-05 | 1 | -2/+8 | |
| | | | ||||||
| * | | Use own variable for "Go to previous comment" hint | Max Kostikov | 2019-05-05 | 1 | -1/+2 | |
| | | | ||||||
| * | | Force to add "go to previous comment" hint | Max Kostikov | 2019-05-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | Scroll back if more than one level in thread | Max Kostikov | 2019-05-05 | 0 | -0/+0 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-05 | 1 | -2/+3 | |
|\| | | | | | | | | | | | | | | Threaded comments navigation elements fixes See merge request hubzilla/core!1632 | |||||
| * | | Threaded comments navigation elements fixes | Max Kostikov | 2019-05-05 | 1 | -2/+3 | |
|/ / | ||||||
* | | Allign arrows position | Max Kostikov | 2019-05-05 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-05-05 | 8 | -150/+222 | |
|\ \ | | | | | | | | | | | | | Add arrows to scroll between related comments See merge request hubzilla/core!1629 | |||||
| * | | Add arrows to scroll between related comments | Max Kostikov | 2019-05-05 | 8 | -150/+222 | |
|/ / | ||||||
* | | Merge branch 'db_update' into 'dev' | Max Kostikov | 2019-05-04 | 4 | -9/+67 | |
|\ \ | | | | | | | | | | | | | port db update improvements from zap See merge request hubzilla/core!1628 | |||||
| * | | port db update improvements from zap | Mario Vavti | 2019-05-03 | 4 | -9/+67 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-04 | 1 | -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 referenced | zotlabs | 2019-05-04 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-04 | 1 | -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 packets | zotlabs | 2019-05-03 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-03 | 2 | -3123/+3206 | |
|\ \ \ | |_|/ |/| | | | | | | | | Update Russian translation See merge request hubzilla/core!1627 | |||||
| * | | Update hstrings.php | Max Kostikov | 2019-05-03 | 1 | -506/+518 | |
| | | | ||||||
| * | | Update hmessages.po | Max Kostikov | 2019-05-03 | 1 | -2617/+2688 | |
| | | | ||||||
| * | | Merge branch 'revert-3528610a' into 'dev' | Max Kostikov | 2019-05-03 | 1 | -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 Kostikov | 2019-05-03 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | This reverts commit 3528610a51df54e843a2f3d55c8b7d925fa2fac7 | |||||
| * | | Fix comment edit field expansion on reply on comment | Max Kostikov | 2019-05-03 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-03 | 1 | -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 ↵ | zotlabs | 2019-05-03 | 1 | -3/+13 | |
| | | | | | | | | | | | | originally envisioned | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-05-03 | 0 | -0/+0 | |
| |\| | ||||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-05-03 | 14 | -82/+234 | |
| |\ \ | ||||||
| * | | | fix item query | zotlabs | 2019-05-02 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | update directory on cover photo changes | Mario Vavti | 2019-05-03 | 1 | -2/+7 | |
| |_|/ |/| | | ||||||
* | | | parent -> id | Mario Vavti | 2019-05-03 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | Merge branch 'replyto_fixes' into 'dev' | Mario | 2019-05-03 | 2 | -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_addr | Mario Vavti | 2019-05-02 | 1 | -2/+2 | |
| | | | ||||||
| * | | provide xchan_url if there is no xchan_addr | Mario Vavti | 2019-05-02 | 2 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-03 | 0 | -0/+0 | |
|\ \ \ | | | | | | | | | | | | | | | | | work on emoji reactions - sync with matching update to addons See merge request hubzilla/core!1623 | |||||
| * \ \ | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-05-02 | 2 | -0/+12 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'dev' of /home/macgirvin/hz into dev | zotlabs | 2019-05-02 | 3 | -3/+59 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge branch 'unfriend_delete_posts_bug' into 'dev' | Mario | 2019-05-03 | 5 | -6/+91 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Unfriend delete posts bug See merge request hubzilla/core!1624 | |||||
| * | | | | | when removed items for unfriended connections, check if the parent has been ↵ | zotlabs | 2019-05-02 | 1 | -3/+20 | |
| | |_|/ / | |/| | | | | | | | | | | | | | retained, not just the item | |||||
| * | | | | emojireaction compat | zotlabs | 2019-05-02 | 2 | -0/+12 | |
| | |/ / | |/| | |