Merge branch 'release/1.0.2' into v1

nystudio107 · Mar 24, 2019 · ae3c932 · ae3c932
2 parents 931c742 + 2752e50
commit ae3c932
Show file tree

Hide file tree

Showing 13 changed files with 119 additions and 358 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,55 @@
+# Craft 3 .gitignore
+#
+# Example .gitignore file for Craft 3 CMS projects
+#
+# @author    nystudio107
+# @copyright Copyright (c) 2017 nystudio107
+# @link      https://nystudio107.com/
+# @package   nystudio107/craft
+# @since     1.0.0
+# @license   MIT
+
+# This file should be renamed to '.gitignore' and placed in your
+# Craft 3 CMS project root directory
+
+# CRAFT ENVIRONMENT
+.env*
+
+# COMPOSER
+/vendor
+
+# CRAFT STORAGE
+/storage/*
+!/storage/.gitkeep
+
+# ASSETS
+/web/assets/*
+
+# BUILD FILES
+/bower_components/*
+/node_modules/*
+/build/*
+/yarn-error.log
+/npm-debug.log
+/web/dist/*
+
+# MISC FILES
+.cache
+.DS_Store
+.idea
+.project
+.settings
+*.esproj
+*.sublime-workspace
+*.sublime-project
+*.tmproj
+*.tmproject
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+config.codekit3
+prepros-6.config
+
+# CUSTOM
diff --git a/.idea/dotenvy.iml b/.idea/dotenvy.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/php.xml b/.idea/php.xml