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.js | |
| 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.js')
| -rw-r--r-- | src/components/conversation/conversation.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 3b540cac..712e2a2c 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -1,6 +1,8 @@ import { reduce, filter, findIndex, clone, get } from 'lodash' import Status from '../status/status.vue' import ThreadTree from '../thread_tree/thread_tree.vue' +import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings.vue' +import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue' import { library } from '@fortawesome/fontawesome-svg-core' import { @@ -343,7 +345,9 @@ const conversation = { }, components: { Status, - ThreadTree + ThreadTree, + QuickFilterSettings, + QuickViewSettings }, watch: { statusId (newVal, oldVal) { |