From 8fa2c560603078e0270f005c3c21ef97419e4555 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 26 Jan 2019 19:51:10 +0100
Subject: [PATCH 1/3] Refs #481 Adding editorconfig

---
 .editorconfig | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..acc9c37a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,91 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# -------------------------------------------------------------------------------------------------
+# Default configuration
+# -------------------------------------------------------------------------------------------------
+# top-most EditorConfig file
+root = true
+
+# Default for all files
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# -------------------------------------------------------------------------------------------------
+# Devilbox Intranet
+# -------------------------------------------------------------------------------------------------
+# Intranet CSS
+[.devilbox/www/htdocs/assets/css/*.css]
+indent_style = tab
+indent_size = 4
+
+# Intranet config
+[.devilbox/www/config.php]
+indent_style = tab
+indent_size = 4
+
+# Intranet libs
+[.devilbox/www/include/lib/**.php]
+indent_style = tab
+indent_size = 4
+
+# Intranet pages
+[.devilbox/www/htdocs/*.php]
+indent_style = tab
+indent_size = 4
+
+# -------------------------------------------------------------------------------------------------
+# Devilbox Git Repository
+# -------------------------------------------------------------------------------------------------
+[.travis.yml]
+indent_style = space
+indent_size = 2
+
+[.tests/**.{php,sh}]
+indent_style = tab
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+indent_size = 4
+
+# -------------------------------------------------------------------------------------------------
+# Devilbox Configuration and Scripts
+# -------------------------------------------------------------------------------------------------
+[{docker-compose.yml,docker-compose-override.yml,docker-compose-override.yml-example}]
+indent_style = space
+indent_size = 2
+
+[compose/docker-compose.override.yml-*]
+indent_style = space
+indent_size = 2
+
+[cfg/vhost-gen/*.yml-*]
+indent_style = space
+indent_size = 2
+
+[{nginx.yml,apache22.yml,apache24.yml}]
+indent_style = space
+indent_size = 2
+
+[{shell.bat,shell.sh,update-docker.sh}]
+indent_style = tab
+indent_size = 4
+
+# -------------------------------------------------------------------------------------------------
+# Devilbox Documentation
+# -------------------------------------------------------------------------------------------------
+[*.md]
+indent_style = space
+trim_trailing_whitespace = false
+indent_size = 2
+
+[docs/**.py]
+indent_style = space
+indent_size = 4
+
+[docs/**.rst]
+indent_style = space
+indent_size = 4

From 4caf169c9d2b5c96284e00b67a916268f2ee934b Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 26 Jan 2019 19:51:40 +0100
Subject: [PATCH 2/3] Ensure current files adhere to .editorconfig

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ff5f7013..f903cdb7 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ simplify your every-day life. If you ever run into any unforseen issues, feel fr
   <tr>
    <td>
     <a target="_blank" href="https://devilbox.readthedocs.io">
-	 <img title="Documentation" name="Documentation" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/readthedocs.png" />
+     <img title="Documentation" name="Documentation" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/readthedocs.png" />
     </a>
    </td>
    <td>
@@ -91,8 +91,8 @@ simplify your every-day life. If you ever run into any unforseen issues, feel fr
    </td>
    <td>
     <a target="_blank" href="https://devilbox.discourse.group">
-	 <img title="Devilbox Forums" name="Forum" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/discourse.png" />
-	</a>
+     <img title="Devilbox Forums" name="Forum" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/discourse.png" />
+    </a>
    </td>
   </tr>
   <tr>

From 20f3dfa86f50e226dff5110965df041644f12039 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 26 Jan 2019 19:52:02 +0100
Subject: [PATCH 3/3] Ensure correct executable bit is set

---
 .devilbox/www/include/vendor/Mail/mimeDecode.php | 0
 shell.bat                                        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 .devilbox/www/include/vendor/Mail/mimeDecode.php
 mode change 100644 => 100755 shell.bat

diff --git a/.devilbox/www/include/vendor/Mail/mimeDecode.php b/.devilbox/www/include/vendor/Mail/mimeDecode.php
old mode 100755
new mode 100644
diff --git a/shell.bat b/shell.bat
old mode 100644
new mode 100755