Merge branch 'master' into add-editor-rulers

browser/main/lib/ConfigManager.js

@@ -53,7 +53,8 @@ export const DEFAULT_CONFIG = {
     latexBlockOpen: '$$',
     latexBlockClose: '$$',
     scrollPastEnd: false,
-    smartQuotes: true
+    smartQuotes: true,
+    sanitize: 'STRICT' // 'STRICT', 'ALLOW_STYLES', 'NONE'
   },
   blog: {
     type: 'wordpress', // Available value: wordpress, add more types in the future plz
@@ -149,6 +150,8 @@ function set (updates) {
     i18n.setLocale('fr')
   } else if (newConfig.ui.language === 'de') {
     i18n.setLocale('de')
+  } else if (newConfig.ui.language === 'hu') {
+    i18n.setLocale('hu')
   } else if (newConfig.ui.language === 'ja') {
     i18n.setLocale('ja')
   } else if (newConfig.ui.language === 'ko') {

browser/main/lib/ipcClient.js

@@ -1,5 +1,4 @@
 import ConfigManager from './ConfigManager'
-import store from 'browser/main/store'
 
 const nodeIpc = require('node-ipc')
 const { remote, ipcRenderer } = require('electron')