Merge branch 'master' of git://github.com/Chill-project/CustomFields

Conflicts:
	Resources/config/services.yml
This commit is contained in:
Marc Ducobu
2014-11-08 15:21:01 +01:00
14 changed files with 224 additions and 1761 deletions

View File

@@ -16,7 +16,6 @@ services:
class: Chill\CustomFieldsBundle\Form\CustomFieldType
arguments:
- "@chill.custom_field.provider"
tags:
- { name: 'form.type', alias: 'custom_field_choice' }
@@ -38,6 +37,8 @@ services:
chill.custom_field.text:
class: Chill\CustomFieldsBundle\CustomFields\CustomFieldText
arguments:
- "@request_stack"
tags:
- { name: 'chill.custom_field', type: 'text' }