Bernhard Schussek
|
53838abf3f
|
Merge remote branch 'symfony/master' into experimental
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
src/Symfony/Component/Form/Resources/config/validation.xml
|
2011-03-28 22:52:15 +02:00 |
|
Fabien Potencier
|
faf9782e6f
|
renamed Twig TransExtension to TranslationExtension
|
2011-03-28 16:16:54 +02:00 |
|
Bernhard Schussek
|
c786fac303
|
[Form] Sample fix implementation of renderers
|
2011-03-26 16:03:34 +01:00 |
|
Bernhard Schussek
|
3f390aa271
|
[Form] Removed EntityType from DefaultTypeLoader
|
2011-03-24 22:50:39 +01:00 |
|
Benjamin Eberlei
|
ee96ad0e81
|
[Form] [DoctrineBridge] Move EntityType and DoctrineTypeLoader into Doctrine Bridge
|
2011-03-24 22:43:00 +01:00 |
|
Fabien Potencier
|
e912b347f0
|
moved integration between the Translation component and Twig to a Symfony Bridge
|
2011-03-23 15:23:52 +01:00 |
|