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

1 files changed, 0 insertions, 67 deletions

diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
deleted file mode 100644
index 92d5ac14..00000000
--- a/src/components/timeline/timeline_quick_settings.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import Popover from '../popover/popover.vue'
-import { mapGetters } from 'vuex'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faFilter,
-  faFont,
-  faWrench
-)
-
-const TimelineQuickSettings = {
-  components: {
-    Popover
-  },
-  methods: {
-    setReplyVisibility (visibility) {
-      this.$store.dispatch('setOption', { name: 'replyVisibility', value: visibility })
-      this.$store.dispatch('queueFlushAll')
-    },
-    openTab (tab) {
-      this.$store.dispatch('openSettingsModalTab', tab)
-    }
-  },
-  computed: {
-    ...mapGetters(['mergedConfig']),
-    loggedIn () {
-      return !!this.$store.state.users.currentUser
-    },
-    replyVisibilitySelf: {
-      get () { return this.mergedConfig.replyVisibility === 'self' },
-      set () { this.setReplyVisibility('self') }
-    },
-    replyVisibilityFollowing: {
-      get () { return this.mergedConfig.replyVisibility === 'following' },
-      set () { this.setReplyVisibility('following') }
-    },
-    replyVisibilityAll: {
-      get () { return this.mergedConfig.replyVisibility === 'all' },
-      set () { this.setReplyVisibility('all') }
-    },
-    hideMedia: {
-      get () { return this.mergedConfig.hideAttachments || this.mergedConfig.hideAttachmentsInConv },
-      set () {
-        const value = !this.hideMedia
-        this.$store.dispatch('setOption', { name: 'hideAttachments', value })
-        this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value })
-      }
-    },
-    hideMutedPosts: {
-      get () { return this.mergedConfig.hideFilteredStatuses },
-      set () {
-        const value = !this.hideMutedPosts
-        this.$store.dispatch('setOption', { name: 'hideFilteredStatuses', value })
-      }
-    },
-    muteBotStatuses: {
-      get () { return this.mergedConfig.muteBotStatuses },
-      set () {
-        const value = !this.muteBotStatuses
-        this.$store.dispatch('setOption', { name: 'muteBotStatuses', value })
-      }
-    }
-  }
-}
-
-export default TimelineQuickSettings