Merge branch 'better-still-emoji' into 'develop'
Status HTML parsing - better emoji and mentions rendering Closes #935 See merge request pleroma/pleroma-fe!1392
This commit is contained in:
commit
8af1f08539
59 changed files with 2641 additions and 879 deletions
|
@ -5,6 +5,7 @@ import FollowButton from '../follow_button/follow_button.vue'
|
|||
import ModerationTools from '../moderation_tools/moderation_tools.vue'
|
||||
import AccountActions from '../account_actions/account_actions.vue'
|
||||
import Select from '../select/select.vue'
|
||||
import RichContent from 'src/components/rich_content/rich_content.jsx'
|
||||
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
||||
import { mapGetters } from 'vuex'
|
||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||
|
@ -120,7 +121,8 @@ export default {
|
|||
AccountActions,
|
||||
ProgressButton,
|
||||
FollowButton,
|
||||
Select
|
||||
Select,
|
||||
RichContent
|
||||
},
|
||||
methods: {
|
||||
muteUser () {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue