Merge branch 'develop' into wakarimasen/pleroma-fe-develop
This commit is contained in:
commit
2f52669380
28 changed files with 440 additions and 171 deletions
|
@ -9,7 +9,8 @@ const Status = {
|
|||
props: [
|
||||
'statusoid',
|
||||
'expandable',
|
||||
'inConversation'
|
||||
'inConversation',
|
||||
'focused'
|
||||
],
|
||||
data: () => ({
|
||||
replying: false,
|
||||
|
@ -34,7 +35,8 @@ const Status = {
|
|||
loggedIn () {
|
||||
return !!this.$store.state.users.currentUser
|
||||
},
|
||||
muted () { return !this.unmuted && this.status.user.muted }
|
||||
muted () { return !this.unmuted && this.status.user.muted },
|
||||
isReply () { return !!this.status.in_reply_to_status_id }
|
||||
},
|
||||
components: {
|
||||
Attachment,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue