Merge branch 'feature/879' into dev

.gitattributes

@@ -1,3 +1,5 @@
+# Text/Binary ----------------------------------------------------------------------------------------------------------
+
 # Default
 
 * text=auto
@@ -14,6 +16,7 @@
 # YAML
 
 *.yml
+*.yaml
 
 # Properties.
 
@@ -44,13 +47,23 @@
 *.htpasswd text
 *.ini text
 
-# CSS/JS
+# CSS
 
 *.css text
-*.js text
+*.sass text
+*.scss text
+*.less text
 *.css.map text
-*.js.map text
+
+# JavaScript
+
+*.js text
+*.ts text
+*.jsx text
+*.tsx text
 *.json text
+*.json5 text
+*.js.map text
 
 # Applescript
 
@@ -94,6 +107,7 @@
 # Documents
 
 *.csv text
+*.tsv text
 *.doc binary
 *.docx binary
 *.odt binary
@@ -112,6 +126,7 @@
 *.jpeg binary
 *.jpg binary
 *.png binary
+*.webp binary
 *.psd binary
 *.svg text
 *.tif binary
@@ -174,17 +189,16 @@
 *.dll binary
 *.exe binary
 *.sh text
+*.pem text
 *.so binary
 
-# Export Ignore --------------------------------------------------------------------------------------------------------
-# This follows `.gitignore` almost exactly.
-
-# NOTE: `/**` does not exclude the directory itself like in Phing.
-# Use only a trailing `/` to achieve that here.
+# Export Ignore — this follows `.gitignore` almost exactly. ------------------------------------------------------------
+# The only exceptions are that we don't ignore `node_modules/`, `bower_components/` or `vendor/`.
 
 # Local
 
 .~* export-ignore
+._* export-ignore
 
 # Logs
 
@@ -195,32 +209,35 @@
 *~ export-ignore
 *.bak export-ignore
 
-# Vendor
-# NOT excluded here.
-
-# vendor/ export-ignore
+# Vagrant
 
-# Node
+.vagrant/ export-ignore
 
-node_modules/ export-ignore
+# TypeScript
 
-# SASS
-
-.sass-cache/ export-ignore
+typings/ export-ignore
 
 # IntelliJ
 
 .idea/ export-ignore
 
 # Sublime
 
-*.sublime-workspace export-ignore
 *.sublime-project export-ignore
+*.sublime-workspace export-ignore
 
-# CTags
+# SASS
+
+.sass-cache/ export-ignore
+
+# Elastic Beanstalk
+
+.elasticbeanstalk/ export-ignore
+
+# CTAGs
 
-*.tags export-ignore
 *.ctags export-ignore
+*.tags export-ignore
 
 # VCS
 
@@ -268,138 +285,18 @@ Icon? export-ignore
 Icons -export-ignore
 ._* export-ignore
 
-# AWS
-
-.elasticbeanstalk/ export-ignore
-
-# Vagrant
-
-.vagrant/ export-ignore
-
-# Export Ignore (More) -------------------------------------------------------------------------------------------------
-# These are in addition to what we have in `.gitignore`.
-
-# SASS
-
-*.scss export-ignore
-*.css.map export-ignore
-
-/src/client-s/**/bourbon/ export-ignore
-/src/vendor/websharks/*/src/client-s/**/bourbon/ export-ignore
-
-# Git
-
-/.gitignore export-ignore
-/src/vendor/*/*/.gitignore export-ignore
-
-/.gitattributes export-ignore
-/src/vendor/*/*/.gitattributes export-ignore
-
-/.gitmodules export-ignore
-/src/vendor/*/*/.gitmodules export-ignore
-
-/.gitchange export-ignore
-/src/vendor/websharks/*/.gitchange export-ignore
-
-# GitHub
-
-/.github/ export-ignore
-/src/vendor/*/*/.github/ export-ignore
-
-/CONTRIBUTING.md export-ignore
-/src/vendor/*/*/CONTRIBUTING.md export-ignore
-
-/ISSUE_TEMPLATE.md export-ignore
-/src/vendor/*/*/ISSUE_TEMPLATE.md export-ignore
-
-/PULL_REQUEST_TEMPLATE.md export-ignore
-/src/vendor/*/*/PULL_REQUEST_TEMPLATE.md export-ignore
+# Export Ignore — in addition to what we have in `.gitignore`. ---------------------------------------------------------
 
 # Assets
 
 /assets/ export-ignore
-/src/vendor/websharks/*/assets/ export-ignore
-
-# Build Files
-
-/phings/ export-ignore
-/src/vendor/*/*/phing/ export-ignore
-/src/vendor/*/*/phings/ export-ignore
-
-/.build.props export-ignore
-/src/vendor/*/*/.build.props export-ignore
-
-/build.xml export-ignore
-/src/vendor/*/*/build.xml export-ignore
-
-/build-*.xml export-ignore
-/src/vendor/*/*/build-*.xml export-ignore
-
-# Dot Build Files
-
-/.build.php export-ignore
-/src/vendor/websharks/*/.build.php export-ignore
-
-/.build.*.php export-ignore
-/src/vendor/websharks/*/.build.*.php export-ignore
-
-/src/.build.php export-ignore
-/src/vendor/websharks/*/src/.build.php export-ignore
-
-/src/.build.*.php export-ignore
-/src/vendor/websharks/*/src/.build.*.php export-ignore
-
-/src/client-s/**/.build.php export-ignore
-/src/vendor/websharks/*/src/client-s/**/.build.php export-ignore
-
-/src/client-s/**/.build.*.php export-ignore
-/src/vendor/websharks/*/src/client-s/**/.build.*.php export-ignore
-
-/src/includes/**/.build.php export-ignore
-/src/vendor/websharks/*/src/includes/**/.build.php export-ignore
-
-/src/includes/**/.build.*.php export-ignore
-/src/vendor/websharks/*/src/includes/**/.build.*.php export-ignore
-
-# Tests
-
-/tests/ export-ignore
-/src/vendor/*/*/test/ export-ignore
-/src/vendor/*/*/tests/ export-ignore
-
-# Drone
-
-/.drone.* export-ignore
-/src/vendor/*/*/.drone.* export-ignore
-
-# Travis
-
-/.travis.* export-ignore
-/src/vendor/*/*/.travis.* export-ignore
-
-# Coverage
-
-/.coveralls.* export-ignore
-/src/vendor/*/*/.coveralls.* export-ignore
-
-/.scrutinizer.* export-ignore
-/src/vendor/*/*/.scrutinizer.* export-ignore
-
-# Post-Receive
-
-/post-receive export-ignore
-/src/vendor/websharks/*/post-receive export-ignore
-
-# PHAR Stub
-
-/src/includes/phar-stub.php export-ignore
-/src/vendor/websharks/*/src/includes/phar-stub.php export-ignore
 
 # LFS Storage (Assets) -------------------------------------------------------------------------------------------------
-# NOTE: Here we need to match all assets explictly; i.e., requires `/**`
 
 /assets/** filter=lfs diff=lfs merge=lfs -text
 
 # ----------------------------------------------------------------------------------------------------------------------
 
-# Custom code reinserted here via [custom] marker. Add your <custom></custom> comment markers here please.
+# <custom>
+#   Put your rules in custom comment markers.
+# </custom>

.gitchange

@@ -1 +1,2 @@
 1491589996
+2ea258a033ce686450ef6bccbc0f66efdba74ac1:58ffb9673670b6.69941207

.gitignore

@@ -1,12 +1,9 @@
-# NOTE: It is not absolutely required (but highly recommended) that you have: `ignorecase = true`
-# in your `.gitconfig` file to maximize compatibility with some of these exclusion patterns.
-
-# NOTE: `/**` does not exclude the directory itself like in Phing.
-# Use only a trailing `/` to achieve that here.
+# Ignore ---------------------------------------------------------------------------------------------------------------
 
 # Local
 
 .~*
+._*
 
 # Logs
 
@@ -17,31 +14,47 @@
 *~
 *.bak
 
+# Vagrant
+
+.vagrant/
+
+# TypeScript
+
+typings/
+
+# IntelliJ
+
+.idea/
+
+# Sublime
+
+*.sublime-project
+*.sublime-workspace
+
 # Vendor
 
 vendor/
 
-# Node
+# NodeJS
 
 node_modules/
 
-# SASS
+# Bower
 
-.sass-cache/
+bower_components/
 
-# IntelliJ
+# SASS
 
-.idea/
+.sass-cache/
 
-# Sublime
+# Elastic Beanstalk
 
-*.sublime-workspace
-*.sublime-project
+.elasticbeanstalk/
 
-# CTags
+# CTAGs
 
-*.tags
 *.ctags
+*.tags
 
 # VCS
 
@@ -89,18 +102,8 @@ Icon?
 !Icons
 ._*
 
-# AWS
-
-.elasticbeanstalk/
-
-# Vagrant
-
-.vagrant/
-
-# For shell glob patterns. This includes Git files too. We simply maintain this list together with `.gitignore`.
-# *~;*.log;*.bak;node_modules;.idea;*.sublime-workspace;*.sublime-project;.git;.gitignore;.gitattributes;.gitmodules;.gitchange;.svn;_svn;CVS;.cvsignore;.bzr;.bzrignore;.hg;.hgignore;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.AppleDB;.AppleDouble;.AppleDesktop;.com.apple.timemachine.donotpresent;Network Trash Folder;Temporary Items;.LSOverride;.Spotlight-V100;.VolumeIcon.icns;.TemporaryItems;.fseventsdv.DS_Store;.Trashes;.apdisk;._*;.elasticbeanstalk;.vagrant
-
-# This list is for IntelliJ IDEA / PhpStorm `File Types` configuration. Some files we actually WANT to work with as part of a project.
-# .sass-cache;.idea;*.sublime-workspace;*.sublime-project;.git;.svn;_svn;CVS;.bzr;.hg;SCCS;RCS;$RECYCLE.BIN;Desktop.ini;Thumbs.db;ehthumbs.db;.AppleDB;.AppleDouble;.AppleDesktop;.com.apple.timemachine.donotpresent;Network Trash Folder;Temporary Items;.LSOverride;.Spotlight-V100;.VolumeIcon.icns;.TemporaryItems;.fseventsdv.DS_Store;.Trashes;.apdisk;._*;.vagrant
+# ----------------------------------------------------------------------------------------------------------------------
 
-# Custom code reinserted here via [custom] marker. Add your <custom></custom> comment markers here please.
+# <custom>
+#   Put your rules in custom comment markers.
+# </custom>