diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-07 16:15:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-07 16:15:41 +0000 |
| commit | 8af1f08539d7c2863107bd3dfd36002b7558e252 (patch) | |
| tree | a50006d11cdf6b834b49c2c98dc192609ba4471a /src/components/basic_user_card/basic_user_card.js | |
| parent | 25a8b48bf28e1a0e0765f28221c5528f5854656b (diff) | |
| parent | 4d73eaa6cef7a8b81bcca719755b11c05717d395 (diff) | |
Merge branch 'better-still-emoji' into 'develop'
Status HTML parsing - better emoji and mentions rendering
Closes #935
See merge request pleroma/pleroma-fe!1392
Diffstat (limited to 'src/components/basic_user_card/basic_user_card.js')
| -rw-r--r-- | src/components/basic_user_card/basic_user_card.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js index 87085a28..8f41e2fb 100644 --- a/src/components/basic_user_card/basic_user_card.js +++ b/src/components/basic_user_card/basic_user_card.js @@ -1,5 +1,6 @@ import UserCard from '../user_card/user_card.vue' import UserAvatar from '../user_avatar/user_avatar.vue' +import RichContent from 'src/components/rich_content/rich_content.jsx' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' const BasicUserCard = { @@ -13,7 +14,8 @@ const BasicUserCard = { }, components: { UserCard, - UserAvatar + UserAvatar, + RichContent }, methods: { toggleUserExpanded () { |