diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-07 17:36:05 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-07 17:36:05 +0000 |
| commit | 068139b27e00137cb1423c0a7751572c54a52148 (patch) | |
| tree | 40c0068aebcd12ecac432d57949d631ef5545eef /src/components/conversation/conversation.vue | |
| parent | 610720f164dc9fcf36f9df33bddec5ac9c654e1e (diff) | |
| parent | 09f3783647ff9e0c194e0e0c71b78e98109635b6 (diff) | |
Merge branch 'timeline-view-menu' into 'develop'
Quick View Menu for timeline and conversations, filter for conversations
Closes #1179
See merge request pleroma/pleroma-fe!1578
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 1adbe250..61832566 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -17,6 +17,14 @@ > {{ $t('timeline.collapse') }} </button> + <QuickFilterSettings + v-if="!collapsable" + :conversation="true" + /> + <QuickViewSettings + v-if="!collapsable" + :conversation="true" + /> </div> <div class="conversation-body panel-body"> <div |