diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-12-02 12:17:43 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-12-02 12:17:43 +0000 |
| commit | d3adffbefecb7029e5bc83048a933907c7317327 (patch) | |
| tree | 8ec7663606b4bc7bb3b5109775983cf7e492d47d /src/components/conversation | |
| parent | 0c6737f33612f6808f687b896cc6e73ba635f0d2 (diff) | |
| parent | 40e774e05abfce6da3c558c09ce1750c132a580f (diff) | |
Merge branch '719' into 'develop'
Fix "Muted users not being collapsed on other user's profiles"
Closes #719
See merge request pleroma/pleroma-fe!1013
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 72ee9c39..08283fff 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -43,7 +43,8 @@ const conversation = { 'collapsable', 'isPage', 'pinnedStatusIdsObject', - 'inProfile' + 'inProfile', + 'profileUserId' ], created () { if (this.isPage) { diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 0f1de55f..2e48240a 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -27,6 +27,7 @@ :highlight="getHighlight()" :replies="getReplies(status.id)" :in-profile="inProfile" + :profile-user-id="profileUserId" class="status-fadein panel-body" @goto="setHighlight" @toggleExpanded="toggleExpanded" |