Merge branch 'develop'

praxisnetau · Aug 1, 2018 · 20f0dfc · 20f0dfc
2 parents 9df4295 + dcb89bf
commit 20f0dfc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/app/webpack.config.js b/app/webpack.config.js
@@ -15,7 +15,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 // Define Base:
 
-const BASE = '/app';
+const BASE = '/resources/app';
 
 // Define Paths:
 

diff --git a/composer.json b/composer.json
@@ -19,18 +19,18 @@
   ],
   "require": {
     "php": ">=5.6.0",
-    "silverstripe/admin": "^1.1",
-    "silverstripe/asset-admin": "^1.1",
-    "silverstripe/assets": "^1.1",
-    "silverstripe/campaign-admin": "^1.1",
-    "silverstripe/cms": "^4.1",
+    "silverstripe/admin": "^1.2",
+    "silverstripe/asset-admin": "^1.2",
+    "silverstripe/assets": "^1.2",
+    "silverstripe/campaign-admin": "^1.2",
+    "silverstripe/cms": "^4.2",
     "silverstripe/config": "^1.0",
-    "silverstripe/errorpage": "^1.1",
-    "silverstripe/framework": "^4.1",
-    "silverstripe/graphql": "^1.1",
-    "silverstripe/reports": "^4.1",
-    "silverstripe/siteconfig": "^4.1",
-    "silverstripe/versioned": "^1.1",
+    "silverstripe/errorpage": "^1.2",
+    "silverstripe/framework": "^4.2",
+    "silverstripe/graphql": "^2.0",
+    "silverstripe/reports": "^4.2",
+    "silverstripe/siteconfig": "^4.2",
+    "silverstripe/versioned": "^1.2",
     "silverware/admin": "^1.3",
     "silverware/calendar": "^1.0",
     "silverware/colorpicker": "^1.0",
@@ -66,7 +66,8 @@
     },
     "expose": [
       "app/admin/client/dist",
-      "app/client/dist"
+      "app/client/dist",
+      "themes/silverware-theme/production"
     ]
   },
   "minimum-stability": "dev",