Merge branch 'master' into v0.11.x

ghettovoice · Oct 3, 2019 · 71bc2de · 71bc2de
2 parents 73bf8aa + e2cf5ff
commit 71bc2de
Show file tree

Hide file tree

Showing 167 changed files with 11,960 additions and 11,998 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -27,11 +27,7 @@ module.exports = {
     'generator-star-spacing': 0,
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'no-console': process.env.NODE_ENV === 'production'
-      ? [2, {
-        'allow': ['error', 'warn']
-      }]
-      : 0,
+    'no-console': process.env.NODE_ENV === 'production' ? [2, { 'allow': ['error', 'warn'] }] : 0,
     'comma-dangle': ['error', 'always-multiline'],
   },
 }
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,34 @@
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
 
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
 ### Node template
 node_modules
 # Logs

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml