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/timeline/timeline.js | |
| 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/timeline/timeline.js')
| -rw-r--r-- | src/components/timeline/timeline.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index c575e876..f195940a 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -2,7 +2,8 @@ import Status from '../status/status.vue' import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js' import Conversation from '../conversation/conversation.vue' import TimelineMenu from '../timeline_menu/timeline_menu.vue' -import TimelineQuickSettings from './timeline_quick_settings.vue' +import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings.vue' +import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue' import { debounce, throttle, keyBy } from 'lodash' import { library } from '@fortawesome/fontawesome-svg-core' import { faCircleNotch, faCog } from '@fortawesome/free-solid-svg-icons' @@ -38,7 +39,8 @@ const Timeline = { Status, Conversation, TimelineMenu, - TimelineQuickSettings + QuickFilterSettings, + QuickViewSettings }, computed: { filteredVisibleStatuses () { |