* upstream/develop: (33 commits)
fix js error on mute
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
Fix sent follow request detection
fix english settings label regarding how to view videos
fix extra buttons merge bug
make size of gif image and preview equal
css improvements
do not unmount post status modal in desktop
hide rich media preview image in case of broken image
Handle JSONified errors while registering
Focus on the search input when the search icon is clicked
prevent scrolling top when click search input
add zoom-in indication to avatar
add zoom-in icon
allow zooming avatar in profile panel header
use $route instead of $router.currentRoute
enlarge avatar in profile page
update unit test
...
This fixes `requestFollow` using the relationship instead of user object,
resulting in `sent` always being false for locked users, and also removes
assumptions about follow request being sent, instead relying on
`requested` from user relationship.
* upstream/develop: (469 commits)
Feature/add sticker picker
guard more secure routes
guard secure routes by redirecting to root
closest can returns itself as well
find inside status-content div only
try to use the closest a tag as target
Update es.json
Also apply keyword filter to subjects
Remove files I accidentally pushed in
fix issues caused by merges in usersearch on @
Add user search at
fix eslint warnings
remove vue-popperjs
fix moderation menu partially hidden by usercard boundary
migrate popper css
rewrite ModerationTools using v-tooltip
make popover position for status action dropdow relative to parent node
rewrite ExtraButtons using v-tooltip
install v-tooltip
i18n/Update pedantic Japanese translation
...
* upstream/develop: (57 commits)
Feature/add sticker picker
guard more secure routes
guard secure routes by redirecting to root
closest can returns itself as well
find inside status-content div only
try to use the closest a tag as target
Update es.json
Also apply keyword filter to subjects
Remove files I accidentally pushed in
fix issues caused by merges in usersearch on @
Add user search at
fix eslint warnings
remove vue-popperjs
fix moderation menu partially hidden by usercard boundary
migrate popper css
rewrite ModerationTools using v-tooltip
make popover position for status action dropdow relative to parent node
rewrite ExtraButtons using v-tooltip
install v-tooltip
i18n/Update pedantic Japanese translation
...
