Merge ezplatform-ee/master into master

ezpublishlegacy · Mar 12, 2018 · 89e9b0e · 89e9b0e
2 parents d605a1a + 5e7e84d
commit 89e9b0e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/app/config/security.yml b/app/config/security.yml
@@ -14,6 +14,10 @@ security:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
+        ezpublish_forgot_password:
+            pattern: /user/(forgot-password|reset-password)
+            security: false
+
         ezpublish_front:
             pattern: ^/
             anonymous: ~

diff --git a/composer.json b/composer.json
@@ -39,26 +39,26 @@
         "doctrine/orm": "^2.5",
         "sensio/distribution-bundle": "^5.0.19",
         "incenteev/composer-parameter-handler": "~2.1",
-        "ezsystems/ezpublish-kernel": "^7.0@dev",
-        "ezsystems/repository-forms": "^2.0@dev",
+        "ezsystems/ezpublish-kernel": "^7.1@dev",
+        "ezsystems/repository-forms": "^2.1@dev",
         "ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
         "ezsystems/ez-support-tools": "^0.2@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": "^1.1@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "^1.1@dev",
         "ezsystems/ezplatform-admin-ui-assets": "^2.0@dev",
-        "ezsystems/ezplatform-design-engine": "^1.1",
-        "ezsystems/platform-ui-bundle": "^2.0@dev",
-        "ezsystems/studio-ui-bundle": "^2.0@dev",
-        "ezsystems/ezstudio-form-builder": "^2.0@dev",
-        "ezsystems/ezstudio-notifications": "^2.0@dev",
-        "ezsystems/date-based-publisher": "^2.0@dev",
-        "ezsystems/landing-page-fieldtype-bundle": "^2.0@dev",
-        "ezsystems/flex-workflow": "^2.0@dev",
+        "ezsystems/ezplatform-design-engine": "^1.2@dev",
+        "ezsystems/platform-ui-bundle": "^2.1@dev",
+        "ezsystems/studio-ui-bundle": "^2.1@dev",
+        "ezsystems/ezstudio-form-builder": "^2.1@dev",
+        "ezsystems/ezstudio-notifications": "^2.1@dev",
+        "ezsystems/date-based-publisher": "^2.1@dev",
+        "ezsystems/landing-page-fieldtype-bundle": "^2.1@dev",
+        "ezsystems/flex-workflow": "^2.1@dev",
         "ezsystems/ezstudio-cron": "^1.0@dev",
-        "ezsystems/ezstudio-installer": "^2.0@dev",
+        "ezsystems/ezstudio-installer": "^2.1@dev",
         "ezsystems/platform-ui-assets-bundle": "^5.0.0",
-        "ezsystems/ezplatform-http-cache-fastly": "^1.0@dev",
+        "ezsystems/ezplatform-http-cache-fastly": "^1.1@dev",
         "ezsystems/ezplatform-demo-assets": "^1.0@beta",
         "ezsystems/comments-bundle": "^6.0@dev",
         "knplabs/knp-menu-bundle": "^2.1",