Merge remote-tracking branch 'origin/develop' into proper-attachments
* origin/develop: (81 commits) Improve the user card for deactivated users Update CHANGELOG.md Update CHANGELOG.md Allow canceling a follow request Simple policy reasons for instance specific policies entity_normalizer: Escape name when parsing user Translated using Weblate (Spanish) Translated using Weblate (Catalan) Translated using Weblate (Korean) Translated using Weblate (Japanese (ja_PEDANTIC)) Translated using Weblate (Indonesian) Translated using Weblate (Esperanto) Translated using Weblate (Vietnamese) Translated using Weblate (Italian) Translated using Weblate (Vietnamese) Translated using Weblate (Indonesian) Translated using Weblate (Italian) Translated using Weblate (Vietnamese) Translated using Weblate (Indonesian) Translated using Weblate (Chinese (Simplified)) ...
This commit is contained in:
commit
c551e3e697
60 changed files with 2766 additions and 313 deletions
|
@ -13,14 +13,16 @@ import {
|
|||
faBell,
|
||||
faRss,
|
||||
faSearchPlus,
|
||||
faExternalLinkAlt
|
||||
faExternalLinkAlt,
|
||||
faEdit
|
||||
} from '@fortawesome/free-solid-svg-icons'
|
||||
|
||||
library.add(
|
||||
faRss,
|
||||
faBell,
|
||||
faSearchPlus,
|
||||
faExternalLinkAlt
|
||||
faExternalLinkAlt,
|
||||
faEdit
|
||||
)
|
||||
|
||||
export default {
|
||||
|
@ -155,6 +157,9 @@ export default {
|
|||
this.$store.state.instance.restrictedNicknames
|
||||
)
|
||||
},
|
||||
openProfileTab () {
|
||||
this.$store.dispatch('openSettingsModalTab', 'profile')
|
||||
},
|
||||
zoomAvatar () {
|
||||
const attachment = {
|
||||
url: this.user.profile_image_url_original,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue