* upstream/develop: (42 commits)
filter outside of component
fix i18n
fix overflow behavior
update styles and remove unnecessary stuff
refactor showing favs and repeats logic
display favs & reblogged users on expanded post in timeline view
display avatars only on highlighted post
add fadein effect to panel
remove commented code
display avatars list on highlighted post
use transition wrapper component
remove custom fadein logic
use a tag for favs/repeated title
use normal font weight instead of lighter
use filter array function
remove important in the property value
remove important in css property
use global fallback variable
remove duplicates from avatars list
add hover effect to label
...
* upstream/develop:
remove &
add a comment
show ellipsis for long user name and screen name
use default_scope parameter
use json content type
clean up
refactoring
add “export blocks” feature
fix wrong function binding
make reusable Exporter component
add “block import” feature
change api function name
make Importer component reusable
add uploading icon css
move formData generating logic to api.service
split out follow’s importer as a separate component
Update avatar uploading
Switch to mastoapi for updating user profile
Switch to mastoapi for updating banner
Switch to mastoapi for updating avatar
* upstream/develop: (85 commits)
entity normalizer: hook up in_reply_to_account_acct
add BBCode strings
fix follow button not updating bug in follow-card
refer searched user objects from the global user rep
set max-width of textarea in settings page
Remove space in the timeline setting copy
user_card.vue: Fix .emoji to apply to img
Update oc.json
Update oc.json
Update oc.json
Update oc.json
replace pencil with wrench icon
rebuild fontello with wrench icon added
fetch all friends using pagination
stop fetching user relationship when user is unauthorized
Revert "recover border between basic-user-card using list component"
remove extra spacing
code readability
fix typos
clean up
...
