Fabien Potencier
b33d5bc352
removed the .gitattributes files ( closes #6605 , reverts #5674 )
2013-01-09 09:51:07 +01:00
Fabien Potencier
8349816dc5
Merge branch '2.0' into 2.1
...
* 2.0:
updated license year
Update src/Symfony/Component/HttpFoundation/Response.php
[Console] fixed unitialized properties (closes #5935 )
[Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
bumped Symfony version to 2.0.21-DEV
updated VERSION for 2.0.21
updated CHANGELOG for 2.0.21
Conflicts:
src/Symfony/Bundle/SwiftmailerBundle/LICENSE
src/Symfony/Component/Filesystem/LICENSE
src/Symfony/Component/HttpFoundation/Response.php
src/Symfony/Component/HttpKernel/Kernel.php
2013-01-04 18:00:54 +01:00
Toni Uebernickel
05fca6d80e
use preferred_choices in favor of preferred_query
2012-12-21 13:49:48 +01:00
Toni Uebernickel
6855cffb1d
add preferred_query option to ModelType
...
This enables the ModelChoiceList to use 'preferred_choices' of the parent ChoiceType.
2012-12-21 12:21:17 +01:00
Igor Wiedler
a5530c5d54
[Propel1Bridge] Fix "and => &&" CS in ModelChoiceList
2012-12-13 23:51:22 +01:00
Martin Hasoň
10e5f3b3df
Removed useless branch alias for dev-master in composer.json
2012-12-06 11:00:55 +01:00
Włodzimierz Gajda
646a714ded
Fix export-ignore on Windows
2012-11-08 10:51:48 +01:00
Igor Wiedler
462dddfac9
[2.1] Exclude tests from zips via gitattributes
2012-10-04 17:17:57 +02:00
Fabien Potencier
3c32fd993d
replaced self.version by 2.1.* in composer.json files
2012-09-10 12:53:42 +02:00
William DURAND
933e821496
Add minimum-stability (dev) in each component
2012-08-22 15:48:41 +02:00
Pascal Borreli
4c726ea64c
Fixed Phpdoc
2012-07-28 16:07:17 +00:00
Bernhard Schussek
b4b5408fdc
[Form] Fixed failing tests
2012-07-25 22:16:38 +02:00
Fabien Potencier
cd24e6ea8f
Revert "raised the minimum version of PHP to 5.3.4 ( closes #3856 )"
...
This reverts commit 2dcc44897e
.
2012-07-15 12:13:51 +02:00
Christoph Schaefer
a80ef6b482
Fixed: The type name specified for the service propel.form.type.model does not match the actual name
2012-07-14 16:45:00 +03:00
Fabien Potencier
2dcc44897e
raised the minimum version of PHP to 5.3.4 ( closes #3856 )
...
We've raised the minimum version of PHP because of a PHP
bug before 5.3.4:
https://bugs.php.net/bug.php?id=52083
https://bugs.php.net/bug.php?id=50027
2012-07-13 21:22:46 +02:00
Fabien Potencier
d100ffaf76
fixed CS
2012-07-09 14:54:20 +02:00
Grégoire Paris
f541a54770
[Form] implement force append / prepend
2012-06-09 17:05:41 +02:00
Fabien Potencier
e08252897a
Revert "merged branch nomack84/rename_form_methods (PR #4473 )"
...
This reverts commit 136b7868f7
, reversing
changes made to 78747e6cc5
.
2012-06-01 07:45:48 +02:00
nomack84
cbc99442c6
[Bridge][Form] Rename some deprecated methods
2012-05-31 08:09:25 -04:00
Bernhard Schussek
8cae3282d8
[Form] setDefaultOptions() is now coded against OptionsResolverInterface
2012-05-25 12:34:16 +02:00
Bernhard Schussek
2cd99e80b6
[Form] Added FormBuilderInterface and FormViewInterface and cleaned up FormTypeInterface and FormTypeExtensionInterface
2012-05-25 12:28:17 +02:00
Bernhard Schussek
027259eba4
[Form] Changed getDefaultOptions() to setDefaultOptions(OptionsResolver $resolver) in FormTypeInterface
2012-05-25 12:28:17 +02:00
Fabien Potencier
3bdf52a16a
fixed CS
2012-05-18 19:42:42 +02:00
Fabien Potencier
ec36ae7eda
merged 2.0
2012-05-18 19:04:58 +02:00
Fabien Potencier
41621e42e9
fixed phpdoc @param alignment
2012-05-15 22:19:31 +02:00
Bernhard Schussek
256b7081a4
[OptionsParser] Renamed OptionsParser to OptionsResolver
2012-05-14 19:35:07 +02:00
Bernhard Schussek
b9d053edb2
[Form] Moved Options classes to new OptionsParser component
2012-05-14 19:35:07 +02:00
Fabien Potencier
3719c70870
updated minimum PHP version to 5.3.3
...
5.3.3 has some interesting fixes and this is the version used by
Redhat 6 and Debian 6
2012-05-07 10:29:11 +02:00
Fabien Potencier
26f933e7bd
fixed CS
2012-05-01 15:23:48 +02:00
Fabien Potencier
9fbf8555f0
Revert "merged branch Seldaek/master (PR #4133 )"
...
This reverts commit 00e7a94a8c
, reversing
changes made to a01dec00f4
.
2012-04-27 19:55:40 +02:00
Jordi Boggiano
00c4267726
Update branch aliases
2012-04-27 12:47:50 +02:00
Fabien Potencier
bad3416cb8
[Propel1Bridge] added CHANGELOG
2012-04-26 22:39:36 +02:00
Bernhard Schussek
d9e142bd62
[Form] Restored and deprecated method guessMinLength
in FormTypeGuesser
2012-04-23 16:02:44 +02:00
julien.galenski
f7200e479c
[Form] added method guessPattern
to FormTypeGuesserInterface
...
rephrase changelog
2012-04-23 12:28:18 +02:00
William DURAND
dbe980bfdc
[Propel1] Fixed typo
2012-04-20 16:15:59 +02:00
Fabien Potencier
11b2d6b5fc
merged branch willdurand/propel-security (PR #4038 )
...
Commits
-------
01ca0ad
[Propel1] Added security layer
Discussion
----------
[Propel1] Added security layer
Fixed the security layer for Propel 1.6, and Symfony2 2.1.
The PropelBundle is ready to go: https://github.com/propelorm/PropelBundle/pull/139
Unit tests are part of the PropelBundle at the moment, as it requires to setup a quick builder.
2012-04-20 16:01:44 +02:00
William DURAND
01ca0ad35d
[Propel1] Added security layer
2012-04-20 15:23:01 +02:00
William DURAND
9447b84acb
[Propel1] Allowed PropelObjectCollection only in CollectionToArrayTransformer
2012-04-20 09:32:01 +02:00
Toni Uebernickel
e43d0fa0fd
reverse transform into PropelObjectCollection
2012-04-20 09:28:12 +02:00
William DURAND
b7c2d3da89
[Propel1] Added tests for guessType() method
2012-04-15 18:54:29 +02:00
William DURAND
897a389ffe
[Propel1] Added tests for the PropelTypeGuesser
2012-04-15 18:38:23 +02:00
Victor Berchet
cffcdc933f
Improve the TypeGuesser to match the latest Sf2.1
2012-04-15 17:22:29 +02:00
William DURAND
fba5d68397
[Propel1] Added composer.json
2012-04-15 02:05:10 +02:00
William DURAND
bbf0122dd0
[Propel1] Fixed phpunit.xml.dist
2012-04-15 02:03:48 +02:00
Bernhard Schussek
5adec19f56
[Form] Fixed typos
2012-04-11 16:37:42 +02:00
Bernhard Schussek
b7330456b6
[Form] Fixed option support in Form component
2012-04-11 16:37:42 +02:00
Bernhard Schussek
2e07256921
[Form] Simplified choice list API
2012-04-10 15:37:24 +02:00
Eriksen Costa
f3efea3a6e
[Propel1Bridge][TwigBridge] fixed export instructions in the README files
2012-04-06 23:24:52 -03:00
Toni Uebernickel
64c7183bf5
clean file docs in Propel1 fixtures
2012-03-30 10:53:43 +02:00
Toni Uebernickel
97ba2189c9
accept read-only models in ModelChoiceList
2012-03-30 10:49:44 +02:00