From fc5a6c16b4f300badd650285976623e64cc1bb77 Mon Sep 17 00:00:00 2001 From: Piotr Nalepa Date: Mon, 10 Apr 2017 16:19:52 +0200 Subject: [PATCH 1/2] EZP-27226: Move MultiFileUploadBundle above the PlatformUIBundle --- app/AppKernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 23e7ead77..e72646d56 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -36,6 +36,7 @@ public function registerBundles() new eZ\Bundle\EzPublishCoreBundle\EzPublishCoreBundle(), new eZ\Bundle\EzPublishLegacySearchEngineBundle\EzPublishLegacySearchEngineBundle(), new eZ\Bundle\EzPublishIOBundle\EzPublishIOBundle(), + new EzSystems\MultiFileUploadBundle\EzSystemsMultiFileUploadBundle(), new eZ\Bundle\EzPublishRestBundle\EzPublishRestBundle(), new EzSystems\PlatformUIAssetsBundle\EzSystemsPlatformUIAssetsBundle(), new EzSystems\PlatformUIBundle\EzSystemsPlatformUIBundle(), @@ -49,7 +50,6 @@ public function registerBundles() new EzSystems\EzContentOnTheFlyBundle\EzSystemsEzContentOnTheFlyBundle(), new Bazinga\Bundle\JsTranslationBundle\BazingaJsTranslationBundle(), new JMS\TranslationBundle\JMSTranslationBundle(), - new EzSystems\MultiFileUploadBundle\EzSystemsMultiFileUploadBundle(), new AppBundle\AppBundle(), ); From b2518a803e401431e38488882b138de1abb0dc35 Mon Sep 17 00:00:00 2001 From: Yannick ROGER Date: Mon, 10 Apr 2017 11:25:28 +0200 Subject: [PATCH 2/2] EZP-27222: Add a warning comment enabling basic rest auth --- app/config/security.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/config/security.yml b/app/config/security.yml index 4603e0280..ba9b6c295 100644 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -10,6 +10,9 @@ security: pattern: ^/(_(profiler|wdt)|css|images|js)/ security: false + ## WARNING + ## Until https://jira.ez.no/browse/EZP-22192 is implemented, + ## enabling basic auth in REST will prevent PlatformUI from working # ezpublish_rest: # pattern: ^/api/ezp/v2 # stateless: true