Christophe Coevoet
df0039f701
[TwigBridge] fixed the check for the collection prototype in the form theme
2011-06-14 00:15:50 +02:00
Fabien Potencier
a12ea12fc1
fixed CS
2011-06-13 18:54:20 +02:00
Fabien Potencier
0b7a19e6fd
[DoctrineBundle] removed old code
2011-06-13 18:38:56 +02:00
Fabien Potencier
d16a708cc8
[Form] simplified file type class
...
File uploads documentation is here:
https://github.com/symfony/symfony-docs/pull/400
2011-06-13 18:11:18 +02:00
Fabien Potencier
59f0602aef
Merge remote branch 'kriswallsmith/assetic/fix-type-hint'
...
* kriswallsmith/assetic/fix-type-hint:
[AsseticBundle] fixed an incorrect type hint
2011-06-13 17:37:08 +02:00
Kris Wallsmith
dc2da52790
[AsseticBundle] fixed an incorrect type hint
2011-06-13 08:27:11 -07:00
Kris Wallsmith
16e3aa3dc3
[AsseticBundle] added FileResource test
2011-06-13 08:17:05 -07:00
Kris Wallsmith
1890dab212
[AsseticBundle] added custom coalescing logic to work with logical template names
2011-06-13 08:17:05 -07:00
Fabien Potencier
33baf9d8ad
[FrameworkBundle] partially reverted previous merge
2011-06-13 17:00:18 +02:00
Fabien Potencier
459678a0e9
Merge remote branch 'vicb/twig-templates'
...
* vicb/twig-templates:
[FrameworkBundle] Fix previous commit
[TwigBundle] Optimize the FilesystemLoader
2011-06-13 16:54:21 +02:00
Fabien Potencier
16e6cea240
[DoctrineBundle] fixed generation of the first entity in a bundle ( closes #1271 )
2011-06-13 16:29:04 +02:00
Fabien Potencier
196350b892
Merge remote branch 'djama/patch-1'
...
* djama/patch-1:
call header() with replace=false, to provide the possibility of sending mutiple headers of the same type.
2011-06-13 12:19:40 +02:00
Fabien Potencier
9c1f999e21
[FrameworkBundle] fixed typo
2011-06-13 11:58:58 +02:00
Fabien Potencier
0c29a25d89
Merge remote branch 'kriswallsmith/form/collection-proto'
...
* kriswallsmith/form/collection-proto:
added script[type="text/html"] collection prototype to form themes
[Form] removed collection prototype from form tree
2011-06-13 11:51:18 +02:00
Fabien Potencier
973b323b12
Merge remote branch 'vicb/form-render-fix'
...
* vicb/form-render-fix:
[Form][TwigBridge] Improve the cache layer by caching blocks instead of templates
[Form][TwigBridge] Make the template cache more efficient
[Form][TwigBridge] Fix rendering
2011-06-13 11:48:44 +02:00
Fabien Potencier
41b7190efc
Revert "[Form] changed the way default type names are created to avoid collisions"
...
This reverts commit d044498cde
.
The reason for reverting is that the name is actually used to customize
the template on a per field basis:
{% block _post_excerpt_widget %}
***{{ block('text_widget') }}***
{% endblock %}
Here, post is the name of the Type.
2011-06-13 11:47:21 +02:00
Fabien Potencier
5526757e13
Merge remote branch 'asm89/default_charset'
...
* asm89/default_charset:
[HttpKernel] Added tests for non UTF-8 content types.
2011-06-13 11:24:02 +02:00
Fabien Potencier
0fc56346f7
Merge remote branch 'AurelC2G/fix-charset'
...
* AurelC2G/fix-charset:
[HttpFoundation] Fixed indentation
[HttpFoundation] Fixed charset always being set to UTF-8
2011-06-13 11:22:46 +02:00
Fabien Potencier
b72f980fac
Merge remote branch 'brikou/phpdoc_formType'
...
* brikou/phpdoc_formType:
[Form] added phpdoc (inherit) for types
2011-06-13 11:20:57 +02:00
Fabien Potencier
11761e48a5
Merge remote branch 'brikou/phpdoc_session'
...
* brikou/phpdoc_session:
[Session] added phpdoc about flash messages
2011-06-13 11:20:35 +02:00
Fabien Potencier
dbac5324ee
Merge remote branch 'pzwosta/php-scope-request'
...
* pzwosta/php-scope-request:
[AsseticBundle] fixed ScopeWideningInjectionExc in prod evn using php templates
2011-06-13 11:15:48 +02:00
Fabien Potencier
0ec604cb1e
Merge remote branch 'mschneid/master'
...
* mschneid/master:
Fix array access
2011-06-13 11:12:46 +02:00
Fabien Potencier
f803086ac6
Merge remote branch 'pborreli/tests-typos'
...
* pborreli/tests-typos:
[Tests] Fixed typos
2011-06-13 11:10:19 +02:00
Fabien Potencier
2ba7e4207c
Merge remote branch 'craue/patch-4'
...
* craue/patch-4:
typo
2011-06-13 11:09:38 +02:00
Kris Wallsmith
a3ed5e3f84
[AsseticBundle] changed file resource string value to logical template name
2011-06-12 19:12:22 -07:00
Lee McDermott
49dd558444
Couple more CS fixes
2011-06-13 02:40:21 +01:00
Michael Schneider
fdab1955f8
Fix array access
...
If you provide only one field as string you're not able to access the $constraint->fields as an array. Use $fields instead.
2011-06-12 23:48:17 +02:00
Pascal Borreli
f5eaa404c7
[Tests] Fixed typos
2011-06-12 20:52:53 +00:00
Christian Raue
99eb3a120d
typo
2011-06-12 11:59:47 -07:00
Victor Berchet
dbea68effc
[FrameworkBundle] Fix previous commit
2011-06-12 18:37:54 +02:00
Victor Berchet
acd2cf11d8
[TwigBundle] Optimize the FilesystemLoader
2011-06-12 14:49:18 +02:00
Victor Berchet
b19052f879
[Form][TwigBridge] Improve the cache layer by caching blocks instead of templates
2011-06-12 12:56:25 +02:00
Victor Berchet
9135f963db
[Form][TwigBridge] Make the template cache more efficient
2011-06-12 12:15:48 +02:00
Victor Berchet
8677aa3dce
[Form][TwigBridge] Fix rendering
2011-06-12 11:33:17 +02:00
Peter Zwosta
c0e120e072
[AsseticBundle] fixed ScopeWideningInjectionExc in prod evn using php templates
...
The definition "assetic.helper.static" references the service "templating.helper.assets" which belongs to a narrower scope. Generally, it is safer to either move "assetic.helper.static" to scope "request" or alternatively rely on the provider pattern by injecting the container itself, and requesting the service "templating.helper.assets" each time it is needed. In rare, special cases however that might not be necessary, then you can set the reference to strict=false to get rid of this error.
2011-06-11 19:49:13 +02:00
Kris Wallsmith
5b0f1da074
[HttpKernel] made WebTestCase methods static
2011-06-11 08:50:27 -07:00
Lee McDermott
5a986bfc27
Add $keysCount & minor CS fix
2011-06-11 16:43:28 +01:00
Lee McDermott
91f4097a09
[Routing] Better nesting for RouteCollections in dumped URL matcher classes
...
With this change, a route prefixed with '/blogger' will be nested inside '/blog' (for example)
2011-06-11 16:11:55 +01:00
Fabien Potencier
f1e8c1bce5
fixed autoloader
2011-06-11 13:58:27 +02:00
Alexander
07d823caa8
[HttpKernel] Added tests for non UTF-8 content types.
...
Tests to check that #1281 is fixed and to prevent regression in the
future.
2011-06-11 13:57:43 +02:00
Brikou CARRE
66ae994528
[Form] added phpdoc (inherit) for types
2011-06-11 11:59:28 +02:00
Brikou CARRE
3dff029c37
[Session] added phpdoc about flash messages
2011-06-11 11:44:30 +02:00
Aurélien Fredouelle
6ae2bdeabd
[HttpFoundation] Fixed indentation
2011-06-11 10:24:44 +02:00
Aurélien Fredouelle
1e50a553d2
[HttpFoundation] Fixed charset always being set to UTF-8
...
Fixes #1281
2011-06-11 10:22:26 +02:00
Joseph Bielawski
6bb9075b35
Remove unused code from DateTime constraint
2011-06-11 01:18:16 -07:00
Fabien Potencier
f5de854d69
fixed autoloading for tests
2011-06-11 09:20:01 +02:00
Fabien Potencier
ca013311bd
[TwigBundle] fixed XSD
2011-06-11 08:00:55 +02:00
Fabien Potencier
355f802546
[TwigBundle] fixed tests
2011-06-11 07:54:10 +02:00
Fabien Potencier
96045739b1
[TwigBundle] removed the extensions setting
2011-06-11 07:50:14 +02:00
Fabien Potencier
afa30d9864
Merge remote branch 'theinterned/patch-1'
...
* theinterned/patch-1:
made logoutPath localizable as well
storing localized targetPath in a string as opposed to updating the attribute
In the spirit of 882a8e3f09
allow for localized logout target url
2011-06-11 07:39:04 +02:00