* upstream/develop: (29 commits)
add hideISP to defaultState of config module
add changelog entry
mrf transparency panel: refactor to use vuex mapState
mrf transparency panel: remove unneeded components{}
boot: cleanup resolveStaffAccounts
lint
about: add MRF transparency panel
about: add staff panel
about page: fix hiding of instance-specific panel, flow ToS and ISP better
nav panel: add link to about page
redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id
clear filter on reopen, fix error message in console
reset position when reopening emoji picker
eslint fix
fix not being able to see unicode emojis when there few of them when searching on emoji-a-ton instances
replace sanity button with loading on scroll
fix search not working, use computer property instead of state
fix eslint warnings
Lightbox/modal multi image improvements - #381
'/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
...
* upstream/develop: (95 commits)
Lightbox/modal multi image improvements - #381
'/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
Add ability to change user's email
translations-de-batch-1
eu-translate update
profile-banner rounding css, fixes#690
fix indentation
remove needless ref
show preview popover when hover numbered replies
refactor conditions
do not make too many nested div
add fetchStatus action
refactor status loading logic
split status preview popover into a separate component
uninstall mobile-detect library
listen both events
minor css fix
restrict distance at top side only
set different trigger event in desktop and mobile by default
fix eslint warnings
...
* emoji-optimizations:
moved emoji fetching from user to instance since it's its state anyway
always preload first batch of emoji to avoid unnecessary UI jumps
* emoji-optimizations:
eslint
fixed emoji picker showing up beyond viewport
start loading emoji when picker is open
remove the "textbox grows the 'wrong' way" behavior, replace it with more conditions to scroll to bottom
arbitrary limit with option to overcome it
emoji picker gradual render
moved emoji stuff away from after-store and into users module since we only need emoji after login