diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-12-12 13:32:52 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-12-12 13:32:52 -0600 |
| commit | 821a2bcc68e1a6c5e0b9a8080b0b8a2be04d1dd2 (patch) | |
| tree | 61b3d62bbd93d9be9c649fa7df8763cbd4bf9195 /src/components/conversation | |
| parent | 43d4d17b41863dd5784f1d611857a9064759946b (diff) | |
| parent | 051b9703dffa785eb3b0fde29d2ceab3fe1255ba (diff) | |
Merge branch 'develop' into feature/lockdown-timelines-private-mode
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" |