Merge remote-tracking branch 'origin/develop' into settings-modal

* origin/develop: (22 commits)
  changelog
  alignment fixes
  Update CHANGELOG.md
  StillImage: Make it work properly in both firefox and chrome.
  ReactButton: Change the combined emoji (heart) to a simple one.
  Linting fixes.
  Settings: Keep a local version of the mutedWordsString
  MediaModal: Close on browser navigation events.
  StatusContent: Try to get hashtag from dataset first.
  Docs: Change wrong documentation.
  EntityNormalizerSpec: More fixes.
  EntityNormalizerSpec: Test new behavior.
  EntityNormalizer: Add colons to emoji alt text.
  fixed case in class name
  The sidebarRight option wasn't being read
  Use consistent naming for Pleroma-FE in README
  Remove mention of GNU Social
  lint
  multiple fixes
  fix non-mention notifs
  ...

src/components/settings_modal/tabs/filtering_tab.js

@@ -1,13 +1,31 @@
+import { filter, trim } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 
 import SharedComputedObject from './helpers/shared_computed_object.js'
 
 const FilteringTab = {
+  data () {
+    return {
+      muteWordsStringLocal: this.$store.getters.mergedConfig.muteWords.join('\n')
+    }
+  },
   components: {
     Checkbox
   },
   computed: {
-    ...SharedComputedObject()
+    ...SharedComputedObject(),
+    muteWordsString: {
+      get () {
+        return this.muteWordsStringLocal
+      },
+      set (value) {
+        this.muteWordsStringLocal = value
+        this.$store.dispatch('setOption', {
+          name: 'muteWords',
+          value: filter(value.split('\n'), (word) => trim(word).length > 0)
+        })
+      }
+    }
   },
   // Updating nested properties
   watch: {

src/components/settings_modal/tabs/helpers/shared_computed_object.js

@@ -1,4 +1,3 @@
-import { filter, trim } from 'lodash'
 import {
   instanceDefaultProperties,
   multiChoiceProperties,
@@ -38,15 +37,6 @@ const SharedComputedObject = () => ({
     }])
     .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
   // Special cases (need to transform values or perform actions first)
-  muteWordsString: {
-    get () { return this.$store.getters.mergedConfig.muteWords.join('\n') },
-    set (value) {
-      this.$store.dispatch('setOption', {
-        name: 'muteWords',
-        value: filter(value.split('\n'), (word) => trim(word).length > 0)
-      })
-    }
-  },
   useStreamingApi: {
     get () { return this.$store.getters.mergedConfig.useStreamingApi },
     set (value) {