diff options
| author | Henry Jameson <me@hjkos.com> | 2022-08-08 01:48:38 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-08-08 01:48:38 +0300 |
| commit | 59d160a6dd6dd1493494f28daf9c1ad44a3ce8e0 (patch) | |
| tree | 282b9498609cb70298ece7aaeed030bc59a1bcec /src/components/conversation/conversation.vue | |
| parent | 4bfad25f01c1b802158f38ff19f373617429e4c2 (diff) | |
| parent | 068139b27e00137cb1423c0a7751572c54a52148 (diff) | |
Merge remote-tracking branch 'origin/develop' into been-awhile
* origin/develop:
lint
fix bugs
Apply 1 suggestion(s) to 1 file(s)
change icons
Update dependency vue-i18n to v9.2.0
made quick settings into their own component, added quick view settings, added both to conversation view
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 |