Merge branch 'studio_master' into studio-demo_master

ezecosystem · Mar 7, 2018 · d605a1a · d605a1a
2 parents 97fa274 + 6f3116e
commit d605a1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -91,3 +91,11 @@ recommendationBundleRestRoutes:
 
 _personalizedBlockRoutes:
      resource: "@EzSystemsPersonalizedBlockBundle/Resources/config/routing.yml"
+
+# Custom redirection from /ez to /admin, feel free to adjust to your needs or remove if you don't need it
+platform1_admin_route:
+    path: /ez
+    controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction
+    defaults:
+        path: /admin
+        permanent: true
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "ezsystems/repository-forms": "^2.0@dev",
         "ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
         "ezsystems/ez-support-tools": "^0.2@dev",
-        "ezsystems/ezplatform-http-cache": "^0.4@dev",
+        "ezsystems/ezplatform-http-cache": "^0.5@dev",
         "ezsystems/ezplatform-admin-ui": "^1.0@dev",
         "ezsystems/ezplatform-admin-ui-modules": "^1.0@dev",
         "ezsystems/ezplatform-admin-ui-assets": "^2.0@dev",