Merge branch 'studio_master' into studio-demo_master

ezecosystem · Feb 25, 2018 · 21b0667 · 21b0667
2 parents dd773e8 + 3a4fd94
commit 21b0667
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -36,7 +36,7 @@ doctrine:
         naming_strategy: doctrine.orm.naming_strategy.underscore
         auto_mapping: true
 
-# Base configuration for Solr, for more options see: https://doc.ez.no/display/EZP/Solr+Search+Engine+Bundle
+# Base configuration for Solr, for more options see: https://doc.ezplatform.com/en/latest/guide/search/#solr-bundle
 # Can have several connections used by each eZ Repositories in ezplatform.yml
 ez_search_engine_solr:
     endpoints:

diff --git a/composer.json b/composer.json
@@ -33,38 +33,36 @@
         "twig/twig": "^1.0||^2.0",
         "twig/extensions": "^1.5.0",
         "symfony/assetic-bundle": "~2.8",
-        "symfony/swiftmailer-bundle": "~2.5",
+        "symfony/swiftmailer-bundle": "^3.0",
         "symfony/monolog-bundle": "^3.1.0",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/orm": "^2.5",
         "sensio/distribution-bundle": "^5.0.19",
         "incenteev/composer-parameter-handler": "~2.1",
-        "ezsystems/ezpublish-kernel": "~7.0.0@dev",
-        "ezsystems/repository-forms": "~2.0.0@dev",
-        "ezsystems/ezplatform-solr-search-engine": "~1.5.0@dev",
-        "ezsystems/ez-support-tools": "~0.2.0@dev",
-        "ezsystems/ezplatform-http-cache": "~0.4.0@dev",
-        "ezsystems/ezplatform-admin-ui": "~1.0.0@dev",
-        "ezsystems/ezplatform-admin-ui-modules": "~1.0.0@dev",
-        "ezsystems/ezplatform-admin-ui-assets": "~1.0.0@dev",
-        "ezsystems/ezplatform-design-engine": "~1.1.0",
-        "ezsystems/platform-ui-bundle": "~2.0.0@dev",
-        "ezsystems/studio-ui-bundle": "~2.0.0@dev",
-        "ezsystems/ezstudio-form-builder": "~2.0.0@dev",
-        "ezsystems/ezstudio-notifications": "~2.0.0@dev",
-        "ezsystems/date-based-publisher": "~2.0.0@dev",
-        "ezsystems/landing-page-fieldtype-bundle": "~2.0.0@dev",
-        "ezsystems/flex-workflow": "~2.0.0@dev",
-        "ezsystems/ezstudio-cron": "~1.0.0@dev",
-        "ezsystems/ezstudio-installer": "~2.0.0@dev",
+        "ezsystems/ezpublish-kernel": "^7.0@dev",
+        "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-admin-ui": "^1.0@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "^1.0@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/ezstudio-cron": "^1.0@dev",
+        "ezsystems/ezstudio-installer": "^2.0@dev",
         "ezsystems/platform-ui-assets-bundle": "^5.0.0",
-        "ezsystems/ezplatform-http-cache-fastly": "~1.0.0@dev",
+        "ezsystems/ezplatform-http-cache-fastly": "^1.0@dev",
         "ezsystems/ezplatform-demo-assets": "^1.0@beta",
         "ezsystems/comments-bundle": "^6.0@dev",
         "knplabs/knp-menu-bundle": "^2.1",
-        "sensio/framework-extra-bundle": "^3.0.2",
         "willdurand/js-translation-bundle": "^2.6.4",
-        "oneup/flysystem-bundle": "^2.0",
         "friendsofsymfony/jsrouting-bundle": "^1.4",
         "white-october/pagerfanta-bundle": "^1.1",
         "roave/security-advisories": "dev-master",
@@ -77,7 +75,8 @@
         "components/bootstrap": "3.3.5",
         "components/handlebars.js": "~3.0.0",
         "ezsystems/ezstudio-personalized-block": "^1.1@rc",
-        "ezsystems/recommendation-bundle": "^2.0@rc"
+        "ezsystems/recommendation-bundle": "^2.0@rc",
+        "symfony/thanks": "^1.0"
     },
     "require-dev": {
         "behat/behat": "~3.2",
@@ -123,7 +122,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "2.1.x-dev"
         }
     }
 }