diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-09-16 07:27:06 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-09-16 07:27:06 +0000 |
| commit | 9b163d281670e0c0a589adce46727284fbcba0ad (patch) | |
| tree | c7aa9233aeb018edeec2560507198aeecaf86209 /src/components/conversation | |
| parent | 09db4ceb1a1ffbd1886648142f2cc2b287dcb5c9 (diff) | |
| parent | baebf08d20eed14d06f9253e4cc939891955f8cb (diff) | |
Merge branch '656' into 'develop'
Do not collapse thread muted posts when it's expanded/on the thread page and do not collapse muted user's posts on muted user's profile page
Closes #656
See merge request pleroma/pleroma-fe!953
Diffstat (limited to 'src/components/conversation')
| -rw-r--r-- | src/components/conversation/conversation.js | 3 | ||||
| -rw-r--r-- | src/components/conversation/conversation.vue | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 10dd8eb0..72ee9c39 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -42,7 +42,8 @@ const conversation = { 'statusId', 'collapsable', 'isPage', - 'pinnedStatusIdsObject' + 'pinnedStatusIdsObject', + 'inProfile' ], created () { if (this.isPage) { diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index f184c071..0f1de55f 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -26,6 +26,7 @@ :in-conversation="isExpanded" :highlight="getHighlight()" :replies="getReplies(status.id)" + :in-profile="inProfile" class="status-fadein panel-body" @goto="setHighlight" @toggleExpanded="toggleExpanded" |