Merge tag 'v1.0.0'

Conflicts: composer.json
ezsystems · Dec 10, 2015 · 35a716a · 35a716a
2 parents 16730a0 + cb10046
commit 35a716a
Show file tree

Hide file tree

Showing 2 changed files with 5,229 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "require": {
         "php": ">=5.4.4",
-        "symfony/symfony": "~2.7.0",
+        "symfony/symfony": "~2.7",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
@@ -29,18 +29,18 @@
         "sensio/generator-bundle": "~2.3",
         "incenteev/composer-parameter-handler": "~2.0",
         "tedivm/stash-bundle": "~0.4.3",
-        "ezsystems/ezpublish-kernel": "~6.0@dev",
-        "ezsystems/repository-forms": "~1.0.0@dev",
-        "ezsystems/ezplatform-solr-search-engine": "~1.0.0@dev",
-        "ezsystems/platform-ui-bundle": "~1.0.0@dev",
-        "ezsystems/platform-ui-assets-bundle": "~1.0.0@dev",
-        "ezsystems/comments-bundle": "~6.0@dev",
-        "ezsystems/studio-ui-bundle": "~1.0@dev",
-        "ezsystems/landing-page-fieldtype-bundle": "~1.0@dev",
-        "ezsystems/ezstudio-demo-bundle": "~1.0@dev",
-        "ezsystems/ezstudio-demo-bundle-data": "~1.0@dev",
-        "ezsystems/share-buttons-bundle": "~1.0@dev",
-        "ezsystems/flex-workflow": "~1.0@dev",
+        "ezsystems/ezpublish-kernel": "~6.0.0",
+        "ezsystems/repository-forms": "~1.0.0",
+        "ezsystems/ezplatform-solr-search-engine": "~1.0.0",
+        "ezsystems/platform-ui-bundle": "~1.0.0",
+        "ezsystems/platform-ui-assets-bundle": "~1.0.0",
+        "ezsystems/comments-bundle": "~6.0.0",
+        "ezsystems/studio-ui-bundle": "~1.0.0",
+        "ezsystems/landing-page-fieldtype-bundle": "~1.0.0",
+        "ezsystems/ezstudio-demo-bundle": "~1.0.0",
+        "ezsystems/ezstudio-demo-bundle-data": "~1.0.0",
+        "ezsystems/share-buttons-bundle": "~1.0.0",
+        "ezsystems/flex-workflow": "~1.0.0",
         "egulias/listeners-debug-command-bundle": "~1.9",
         "white-october/pagerfanta-bundle": "1.0.*",
         "hautelook/templated-uri-bundle": "~1.0 | ~2.0",
@@ -55,7 +55,7 @@
         "behat/mink-goutte-driver": "*",
         "behat/mink-selenium2-driver": "*",
         "jarnaiz/behat-junit-formatter": "^1.3",
-        "ezsystems/behatbundle": "@dev"
+        "ezsystems/behatbundle": "~6.0.0"
     },
     "suggest": {
         "ezsystems/legacy-bridge": "Provides the full legacy backoffice and legacy features"
@@ -83,7 +83,10 @@
     },
     "config": {
         "process-timeout": 3000,
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "platform": {
+            "php": "5.4.4"
+        }
     },
     "extra": {
         "symfony-app-dir": "app",
@@ -94,9 +97,6 @@
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
             "file": "app/config/parameters.yml"
-        },
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
         }
     }
 }