Skip to content

Commit b97830d

Browse files
committed
Merge pull request #212 from symfony-cmf/prepare-next-version
Prepare next version
2 parents 862ab97 + 7edecbe commit b97830d

File tree

3 files changed

+139
-128
lines changed

3 files changed

+139
-128
lines changed

app/config/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ cmf_core:
9494
persistence:
9595
phpcr:
9696
enabled: true
97+
translation_strategy: attribute
9798

9899
cmf_blog:
99100
blog_basepath: /cms/content
@@ -122,6 +123,9 @@ cmf_simple_cms:
122123

123124
cmf_create:
124125
editor_base_path: /bundles/cmfcreate/vendor/ckeditor/
126+
# WARNING: REMOVE THIS FOR PRODUCTION SITES
127+
# for demo purposes we are allowing anonymous inline editing
128+
role: IS_AUTHENTICATED_ANONYMOUSLY
125129

126130
sonata_block:
127131
default_contexts: [cms]
@@ -262,7 +266,6 @@ liip_search:
262266
cmf_search:
263267
persistence:
264268
phpcr:
265-
translation_strategy: child
266269
search_fields:
267270
title: title
268271
summary: body

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
"sensio/distribution-bundle": "2.3.*",
2020
"sensio/framework-extra-bundle": "2.3.*",
2121
"sensio/generator-bundle": "2.3.*",
22-
"symfony-cmf/symfony-cmf": "1.0.0-RC2",
23-
"symfony-cmf/simple-cms-bundle": "1.0.0-RC4",
24-
"symfony-cmf/search-bundle": "1.0.0-RC2",
22+
"symfony-cmf/symfony-cmf": "1.0.0-RC4",
23+
"symfony-cmf/simple-cms-bundle": "1.0.0-RC5",
24+
"symfony-cmf/search-bundle": "1.0.0-RC3",
2525
"symfony-cmf/create-bundle": "1.0.0-RC2",
2626
"symfony-cmf/routing-auto-bundle": "1.0.0-alpha5",
2727
"symfony-cmf/blog-bundle": "1.0.0-beta6",
28-
"jackalope/jackalope-doctrine-dbal": "1.0.0-RC1",
28+
"jackalope/jackalope-doctrine-dbal": "1.0.0-RC3",
2929
"jackalope/jackalope-jackrabbit": "1.0.0-RC2",
3030
"doctrine/doctrine-bundle": "1.2.*",
3131
"doctrine/data-fixtures": "1.0.*",
3232
"sonata-project/cache-bundle": "2.1.*",
33-
"sonata-project/doctrine-phpcr-admin-bundle": "1.0.0-RC1",
33+
"sonata-project/doctrine-phpcr-admin-bundle": "1.0.0-RC2",
3434
"eko/feedbundle": "1.0.*",
3535
"lunetics/locale-bundle": "2.2.*",
3636
"liip/functional-test-bundle": "1.0.*",

0 commit comments

Comments
 (0)