Fabien Potencier
82f1461031
Merge remote branch 'weaverryan/form_remove_extra_timezone_options' into form
...
* weaverryan/form_remove_extra_timezone_options:
[Form] Removing excess option in the TimezoneType
2011-04-22 08:38:35 +02:00
Fabien Potencier
4f4979c84a
Merge remote branch 'weaverryan/form_container_aware_type_loader_check' into form
...
* weaverryan/form_container_aware_type_loader_check:
[FrameworkBundle] Adding check for invalid form type for better exception message
2011-04-22 08:37:33 +02:00
Eriksen Costa
9cf7fba913
Merge branch 'master' into fix-stub-locale-method-signature
2011-04-22 00:07:29 -03:00
Eriksen Costa
7bbb8beb17
[FrameworkBundle] updated method call
2011-04-21 23:20:52 -03:00
Eriksen Costa
589b0ab4ed
Merge branch 'master' into form-frameworkbundle-form-guessers-fix
...
Conflicts:
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddFormGuessersPass.php
src/Symfony/Component/Form/MoneyField.php
2011-04-21 23:03:40 -03:00
Ryan Weaver
1856601524
[Validator] Modifying Choice message and adding a different multiple message
2011-04-21 20:05:13 -05:00
Ryan Weaver
df50e2b161
[Form] Removing excess option in the TimezoneType
2011-04-21 19:57:53 -05:00
Ryan Weaver
fb4eb9c2e9
[FrameworkBundle] Adding check for invalid form type for better exception message
2011-04-21 19:51:10 -05:00
Ryan Weaver
f98916dcc8
[TwigBundle] Removing dbug text in form template
2011-04-21 19:49:45 -05:00
Kris Wallsmith
b69ed7f766
[AsseticBundle] fixed controller
2011-04-21 15:01:24 -07:00
Fabien Potencier
e6d86eb9f7
moved DoctrineMongoDBBundle to its own repository
...
The repo is now here: https://github.com/symfony/DoctrineMongoDBBundle
It has been done as the bundle depends on Doctrine Common 2.1, but everything
else in Symfony relies on Doctrine Common 2.0.
2011-04-21 23:14:21 +02:00
Fabien Potencier
fc23f39335
[AsseticBundle] fixed unit tests
2011-04-21 22:50:25 +02:00
Fabien Potencier
8b2b8e16dc
Merge remote branch 'schmittjoh/referenceValidation'
...
* schmittjoh/referenceValidation:
[DependencyInjection] also check references of inlined services
[DependencyInjection] adds emulation of "exception-on-invalid-reference" behavior
2011-04-21 22:44:20 +02:00
Fabien Potencier
30e907663b
[FrameworkBundle] removed unneeded files in tests
2011-04-21 22:43:38 +02:00
Fabien Potencier
6452878d28
updated vendors
2011-04-21 22:40:59 +02:00
Fabien Potencier
d86aa74e3d
[FrameworkBundle] removed the need to boot a Kernel in a unit test file
2011-04-21 22:34:53 +02:00
Fabien Potencier
4dc5b8ec78
[FrameworkBundle] removed the need to boot a Kernel in a unit test file
2011-04-21 21:49:05 +02:00
Fabien Potencier
813627bd4c
[Routing] added getContext() accessor
2011-04-21 21:20:27 +02:00
Fabien Potencier
c5497c7c67
[HttpFoundation] fixed a potential security problem in Request
2011-04-21 20:00:27 +02:00
Fabien Potencier
40e6030aff
updated vendors
2011-04-21 20:00:06 +02:00
Fabien Potencier
a2ab05e9c2
Merge remote branch 'web-dev/master'
...
* web-dev/master:
Added 201 to the possible status codes that indicate a response is a redirect.
2011-04-21 19:51:30 +02:00
Josiah
98e46a23fa
Added 201 to the possible status codes that indicate a response is a redirect.
2011-04-21 10:36:25 -07:00
Fabien Potencier
314684df24
[FrameworkBundle] made ESI URL relative as allowed by the spec (no need to generate absolute URLs)
...
see http://www.w3.org/TR/esi-lang (Section 3.1 "Relative URIs will be resolved relative to the template.")
2011-04-21 18:54:01 +02:00
Fabien Potencier
c67dd2bb68
Merge remote branch 'kriswallsmith/assetic/runtime-is-funtime'
...
* kriswallsmith/assetic/runtime-is-funtime:
[AsseticBundle] fixed router and controller
[AsseticBundle] removed fake front controller from URL before creating route
[AsseticBundle] updated twig integration to check debug mode at runtime rather than compile time since twig cannot vary its cache by debug mode
2011-04-21 18:38:03 +02:00
Fabien Potencier
9a2d4c77c3
Merge remote branch 'Garfield-fr/master'
...
* Garfield-fr/master:
[Container] Added function array_unique on getServiceIds to return only one service name
2011-04-21 18:31:55 +02:00
Kris Wallsmith
57dd6aef86
[AsseticBundle] fixed router and controller
2011-04-21 07:28:23 -07:00
Kris Wallsmith
6a227f858a
[AsseticBundle] removed fake front controller from URL before creating route
2011-04-21 07:08:29 -07:00
Kris Wallsmith
8ad93095d4
[AsseticBundle] updated twig integration to check debug mode at runtime rather than compile time since twig cannot vary its cache by debug mode
2011-04-21 05:41:45 -07:00
Bernhard Schussek
c58b05a6d6
[Form] Removed obsolete code in TextType
2011-04-21 10:17:04 +02:00
Fabien Potencier
7e33159723
[Routing] the global parameters must not be added in the QS when generating URLs
2011-04-21 09:52:35 +02:00
Fabien Potencier
286c45733e
removed the possibility to pass a message to the trans tag
...
The trans tag should only be used with static texts as automatic output escaping does not occur.
2011-04-21 09:10:47 +02:00
Fabien Potencier
cad6643e77
simplified exceptions as Twig is now smart enough to automatically add line information
2011-04-21 09:03:30 +02:00
Fabien Potencier
54b77d24dd
made the %count% variable automatically available when using the transchoice filter (similar to how the tag works)
2011-04-21 09:01:11 +02:00
Fabien Potencier
9694ac77a7
[Form] fixed translations escaping
2011-04-21 07:48:12 +02:00
Bertrand Zuchuat
7ed8ea25d8
[Container] Added function array_unique on getServiceIds to return only one service name
2011-04-20 23:45:36 +02:00
Fabien Potencier
ea021062ba
Merge remote branch 'vicb/assetic-cache-warmer'
...
* vicb/assetic-cache-warmer:
[AsseticBundle] Update the cache warmer tests
[AsseticBundle] Fix the cache warmers
2011-04-20 23:31:40 +02:00
Victor Berchet
f7b1839296
[AsseticBundle] Update the cache warmer tests
2011-04-20 23:28:19 +02:00
Fabien Potencier
071caeb0c8
Merge remote branch 'merk/file'
...
* merk/file:
[HttpFoundation\File] Removed realpath()
2011-04-20 23:13:55 +02:00
Fabien Potencier
9c2d49e4f5
Merge remote branch 'weaverryan/fixtures_old_xml_namespace'
...
* weaverryan/fixtures_old_xml_namespace:
[FrameworkBundle] Upating XML test fixtures for newer namespace
2011-04-20 23:13:20 +02:00
Fabien Potencier
d721cbe1e2
Merge remote branch 'kriswallsmith/http/filesystem-session-fix'
...
* kriswallsmith/http/filesystem-session-fix:
[HttpFoundation] fixed FilesystemSessionStorage
2011-04-20 23:09:04 +02:00
Ryan Weaver
a5aba7dbd7
[FrameworkBundle] Upating XML test fixtures for newer namespace
...
This wasn't actually affecting anything (which is why it wasn't caught), but this is more correct.
2011-04-20 16:08:55 -05:00
Fabien Potencier
ace5e26406
Merge remote branch 'schmittjoh/security'
...
* schmittjoh/security:
[Security/Core] force implementations to accept null values
[Security/Acl] some misc fixes
[Security/Acl] removed Doctrine dependency from interfaces and moved them to the actual implementation
[SecurityBundle] changed expected value for token_provider key in the rememberme section
2011-04-20 23:07:33 +02:00
Fabien Potencier
7266b41ade
[FrameworkBundle] added the current locale as the default value for _locale when generating routes
2011-04-20 23:03:01 +02:00
Fabien Potencier
c6dcf0f8f3
[Routing] added a way to set default parameters that are applied when generating URLs
2011-04-20 23:01:05 +02:00
Fabien Potencier
f7d44148df
[Routing] removed unused defaults variable
2011-04-20 22:55:23 +02:00
Johannes Schmitt
192592ec9b
[Security/Core] force implementations to accept null values
2011-04-20 22:38:16 +02:00
Johannes Schmitt
f697fe3b26
[Security/Acl] some misc fixes
2011-04-20 22:35:17 +02:00
Johannes Schmitt
4d6e239f10
[Security/Acl] removed Doctrine dependency from interfaces and moved them to the actual implementation
2011-04-20 22:25:05 +02:00
Johannes Schmitt
8ae7a21e30
[SecurityBundle] changed expected value for token_provider key in the rememberme section
2011-04-20 22:20:55 +02:00
Kris Wallsmith
30511d2965
[HttpFoundation] fixed FilesystemSessionStorage
2011-04-20 13:20:21 -07:00