Merge branch 'develop'

.env.example

@@ -30,6 +30,6 @@ SS_DATABASE_PASSWORD="<password>"
 SS_DEFAULT_ADMIN_USERNAME="<user>"
 SS_DEFAULT_ADMIN_PASSWORD="<password>"
 
-# Host Name (for CLI commands):
+# Base URL (for CLI commands, e.g. "//localhost/"):
 
-SS_HOST = "<hostname>"
+SS_BASE_URL="<hostname>"

.htaccess

@@ -28,7 +28,7 @@ ErrorDocument 500 /assets/error-500.html
   # Turn off index.php handling requests to the homepage fixes issue in apache >=2.4
   <IfModule mod_dir.c>
     DirectoryIndex disabled
-    DirectorySlash Off
+    DirectorySlash On
   </IfModule>
 
   SetEnv HTTP_MOD_REWRITE On

app/_config/config.yml

@@ -7,13 +7,6 @@ Name: app
 SilverStripe\Core\Manifest\ModuleManifest:
   project: app
 
-# Configure App Themes:
-
-SilverStripe\View\SSViewer:
-  themes:
-    - silverware-theme
-    - '$default'
-
 # Configure App Locale:
 
 SilverStripe\i18n\i18n:

app/_config/theme.yml

@@ -0,0 +1,10 @@
+---
+Name: app-theme
+---
+
+# Configure App Themes:
+
+SilverStripe\View\SSViewer:
+  themes:
+    - silverware-theme
+    - '$default'

app/fixtures/templates.yml

@@ -4,7 +4,9 @@ SilverWare\Model\Template:
   Main:
     +SilverWare\Sections\HeaderSection.Header:
       StyleID: Header
+      EdgeToEdge: true
       +Row:
+        NoGutters: true
         +Column:
           +SilverWare\Navigation\Components\BarNavigation.NavBar:
             BrandText: 'SilverWare'

assets/.htaccess

@@ -5,7 +5,11 @@
 #
 
 <IfModule mod_rewrite.c>
-  SetEnv HTTP_MOD_REWRITE On
+  <IfModule mod_env.c>
+    SetEnv HTTP_MOD_REWRITE On
+  </IfModule>
+
+  # Enable rewriting
   RewriteEngine On
 
   # Disable PHP handler

composer.json

@@ -19,27 +19,27 @@
   "require": {
     "php": ">=5.6.0",
     "gdmedia/ss-auto-git-ignore": "^1.0",
-    "silverstripe/admin": "1.1.x-dev",
-    "silverstripe/asset-admin": "1.1.x-dev",
-    "silverstripe/assets": "1.1.x-dev",
-    "silverstripe/campaign-admin": "1.1.x-dev",
-    "silverstripe/cms": "4.1.x-dev",
-    "silverstripe/config": "1.1.x-dev",
-    "silverstripe/errorpage": "1.1.x-dev",
-    "silverstripe/framework": "4.1.x-dev",
-    "silverstripe/graphql": "1.1.x-dev",
-    "silverstripe/reports": "4.1.x-dev",
-    "silverstripe/siteconfig": "4.1.x-dev",
-    "silverstripe/versioned": "1.1.x-dev",
+    "silverstripe/admin": "^1.0",
+    "silverstripe/asset-admin": "^1.0",
+    "silverstripe/assets": "^1.0",
+    "silverstripe/campaign-admin": "^1.0",
+    "silverstripe/cms": "^4.0",
+    "silverstripe/config": "^1.0",
+    "silverstripe/errorpage": "^1.0",
+    "silverstripe/framework": "^4.0",
+    "silverstripe/graphql": "^1.0",
+    "silverstripe/reports": "^4.0",
+    "silverstripe/siteconfig": "^4.0",
+    "silverstripe/versioned": "^1.0",
     "silverware/admin": "^1.2",
     "silverware/calendar": "^1.0",
     "silverware/colorpicker": "^1.0",
     "silverware/countries": "^1.0",
     "silverware/font-icons": "^1.1",
     "silverware/model-filters": "^1.0",
-    "silverware/navigation": "^1.4",
+    "silverware/navigation": "^1.5",
     "silverware/open-graph": "^1.0",
-    "silverware/silverware": "^1.3",
+    "silverware/silverware": "^1.5",
     "silverware/spam-guard": "^1.0",
     "silverware/theme": "^1.2",
     "silverware/validator": "^1.1"