Merge pull request #211 from symfony-cmf/prepare-next-version

Prepare next version
symfony-cmf · Oct 2, 2013 · 862ab97 · 862ab97
2 parents 0060aec + 701854b
commit 862ab97
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 250 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -128,6 +128,8 @@ sonata_block:
     blocks:
         sonata.admin.block.admin_list:
             contexts:   [admin]
+        sonata.admin.block.search_result:
+            contexts:   [admin]
         sonata_admin_doctrine_phpcr.tree_block:
             settings:
                 id: '/cms'
@@ -295,7 +297,7 @@ cmf_media:
     use_jms_serializer:      auto
     use_elfinder:            auto
     use_imagine:             auto
-    imagine_filter:
+    imagine_filters:
         upload_thumbnail:   ~ # default: image_upload_thumbnail
         elfinder_thumbnail: ~ # default: elfinder_thumbnail
 

diff --git a/composer.json b/composer.json
@@ -19,18 +19,18 @@
         "sensio/distribution-bundle": "2.3.*",
         "sensio/framework-extra-bundle": "2.3.*",
         "sensio/generator-bundle": "2.3.*",
-        "symfony-cmf/symfony-cmf": "1.0.0-RC1",
-        "symfony-cmf/simple-cms-bundle": "1.0.0-RC3",
-        "symfony-cmf/search-bundle": "1.0.0-RC1",
-        "symfony-cmf/create-bundle": "1.0.0-RC1",
-        "symfony-cmf/routing-auto-bundle": "1.0.0-alpha4",
-        "symfony-cmf/blog-bundle": "1.0.0-beta5",
-        "jackalope/jackalope-doctrine-dbal": "1.0.0-beta4",
-        "jackalope/jackalope-jackrabbit": "1.0.0-beta4",
+        "symfony-cmf/symfony-cmf": "1.0.0-RC2",
+        "symfony-cmf/simple-cms-bundle": "1.0.0-RC4",
+        "symfony-cmf/search-bundle": "1.0.0-RC2",
+        "symfony-cmf/create-bundle": "1.0.0-RC2",
+        "symfony-cmf/routing-auto-bundle": "1.0.0-alpha5",
+        "symfony-cmf/blog-bundle": "1.0.0-beta6",
+        "jackalope/jackalope-doctrine-dbal": "1.0.0-RC1",
+        "jackalope/jackalope-jackrabbit": "1.0.0-RC2",
         "doctrine/doctrine-bundle": "1.2.*",
         "doctrine/data-fixtures": "1.0.*",
         "sonata-project/cache-bundle": "2.1.*",
-        "sonata-project/doctrine-phpcr-admin-bundle": "1.0.0-beta5",
+        "sonata-project/doctrine-phpcr-admin-bundle": "1.0.0-RC1",
         "eko/feedbundle": "1.0.*",
         "lunetics/locale-bundle": "2.2.*",
         "liip/functional-test-bundle": "1.0.*",