hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Sean King 2022-08-06 22:02:21 -06:00
commit dc9951d400
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
166 changed files with 2374 additions and 1602 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/notification/notification.js
View file

@ -6,6 +6,7 @@ import UserCard from '../user_card/user_card.vue'
import Timeago from '../timeago/timeago.vue'
import Report from '../report/report.vue'
import RichContent from 'src/components/rich_content/rich_content.jsx'
import UserPopover from '../user_popover/user_popover.vue'
import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@ -40,7 +41,7 @@ const Notification = {
unmuted: false
}
},
props: [ 'notification' ],
props: ['notification'],
components: {
StatusContent,
UserAvatar,
@ -48,7 +49,8 @@ const Notification = {
Timeago,
Status,
Report,
RichContent
RichContent,
UserPopover
},
methods: {
toggleUserExpanded () {