Skip to content

Commit

Permalink
Merge branch 'master' into studio_master
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed Mar 7, 2018
2 parents 0b2403a + 11d438a commit 6f3116e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 8 additions & 0 deletions app/config/routing.yml
Expand Up @@ -50,3 +50,11 @@ ezplatform.ee.landing_page:

fos.js_routing:
resource: '@FOSJsRoutingBundle/Resources/config/routing/routing.xml'

# 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
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -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",
Expand Down

0 comments on commit 6f3116e

Please sign in to comment.