Fabien Potencier
d95a743d9f
Merge remote branch 'Brouznouf/master'
...
* Brouznouf/master:
[Serializer] Revert DOMElement to SimpleXmlElement
[Serializer] Using DOMElement instead of SimpleXmlElement in XmlEncoder to permit some behavior
2011-04-12 13:02:35 +02:00
Fabien Potencier
55a8f8d098
extracted common layout for internal/core pages
...
CSS styles should probably be renamed at some point.
2011-04-12 12:32:59 +02:00
Fabien Potencier
e6fd8deb00
[Security] tweaked some exception messages
2011-04-12 11:41:39 +02:00
Brouznouf
86343b43ec
[Serializer] Revert DOMElement to SimpleXmlElement
2011-04-12 11:18:17 +02:00
Brouznouf
b02c1d9f32
Merge remote branch 'upstream/master'
2011-04-12 11:17:09 +02:00
Martin Hason
d39ea6ae79
[Bridge][Twig] improved behaviour of the transchoice tag (support for variables)
2011-04-12 11:15:19 +02:00
Martin Hason
d300b94745
[Bridge][Twig] added transchoice filter
2011-04-12 11:10:55 +02:00
Fabien Potencier
41a1a75b92
[Process] made default options overridable
2011-04-12 11:04:35 +02:00
Fabien Potencier
7f911642e1
Merge remote branch 'pborreli/windows-process-fix'
...
* pborreli/windows-process-fix:
[Process][Windows] Don't use cmd for launching process (fixing Sismo git.exe calling)
2011-04-12 11:04:02 +02:00
Fabien Potencier
57f814b2e3
Merge remote branch 'beberlei/YamlValidatorFix'
...
* beberlei/YamlValidatorFix:
[FrameworkBundle][Validation] Fix bug where YAML Validation files are not detected.
2011-04-12 10:59:56 +02:00
Fabien Potencier
d163a60f54
[Security] fixed URL
2011-04-12 10:49:22 +02:00
Lukas Kahwe Smith
a4b04c4add
use synthetic services instead of special exceptions
2011-04-12 10:07:46 +02:00
Pascal Borreli
3e8874df75
Merge remote-tracking branch 'upstream/master' into windows-process-fix
2011-04-12 01:05:46 +00:00
Brouznouf
8e6233e9c2
[Serializer] Using DOMElement instead of SimpleXmlElement in XmlEncoder to permit some behavior
2011-04-12 00:58:21 +02:00
Benjamin Eberlei
d27dc86c25
[FrameworkBundle][Validation] Fix bug where YAML Validation files are not detected.
2011-04-11 23:26:11 +02:00
Fabien Potencier
27d2b049f8
Merge remote branch 'Seldaek/init_bundle'
...
* Seldaek/init_bundle:
[FrameworkBundle] Allow init:bundle to be called with / as namespace separator
2011-04-11 18:39:36 +02:00
Fabien Potencier
92c8edc2b5
Merge remote branch 'weaverryan/router_debug_format_tweak'
...
* weaverryan/router_debug_format_tweak:
[FrameworkBundle] router:debug - better string dumping to avoid namespace escaping
2011-04-11 18:39:04 +02:00
Fabien Potencier
2be704e212
Merge remote branch 'weaverryan/request_listener_log_change'
...
* weaverryan/request_listener_log_change:
[FrameworkBundle] Tweak to how the routing parameters are output
2011-04-11 18:38:39 +02:00
Fabien Potencier
78c5a0ac90
Merge remote branch 'weaverryan/assets_install_command_mods'
...
* weaverryan/assets_install_command_mods:
[FrameworkBundle] Improving the output and help messages in the task (no behavioral change)
2011-04-11 18:37:00 +02:00
Fabien Potencier
aa26624161
Merge remote branch 'vicb/template_logical_name'
...
* vicb/template_logical_name:
Display template logical names in exception messages
2011-04-11 18:35:51 +02:00
Kris Wallsmith
c5fe4c390d
[Templating] cleaned up some anomalies in the engine
2011-04-11 09:20:47 -07:00
Fabien Potencier
7f2294395c
[Form] reverted the templating part to be similar to what we have today
2011-04-11 16:42:51 +02:00
Francis Besset
b4d8091cdc
[FrameworkBundle] Fixed validators translation french message
2011-04-10 19:02:03 +02:00
Jordi Boggiano
7d61c003da
[FrameworkBundle] Allow init:bundle to be called with / as namespace separator
2011-04-10 12:22:25 +02:00
Ryan Weaver
409df12a36
[FrameworkBundle] router:debug - better string dumping to avoid namespace escaping
...
Before this change, the var_export causes namespaces to be escaped:
Before: 'Symfony\\Component\\...'
After: Symfony\Component\...
2011-04-09 17:53:33 -05:00
Ryan Weaver
3e41bef1e8
[FrameworkBundle] Tweak to how the routing parameters are output
...
The json_encode is actually really nice, except that it results in the "escaped" namesapces (e.g. Symfony\\Component\\...).
2011-04-09 17:35:31 -05:00
Pascal Borreli
46b4098907
[Process][Windows] Don't use cmd for launching process (fixing Sismo git.exe calling)
2011-04-09 17:31:26 +00:00
Ryan Weaver
91df6d9f5c
[FrameworkBundle] Improving the output and help messages in the task (no behavioral change)
2011-04-09 09:13:24 -05:00
Victor Berchet
e254ff8cc6
Display template logical names in exception messages
2011-04-08 19:56:12 +02:00
Victor Berchet
e80a693cfe
[FrameworkBundle] Enforce templates instances of TemplateReferenceInterface
2011-04-08 18:54:19 +02:00
Victor Berchet
c45d5c89cc
[FrameworkBundle] Add unit tests for the CacheTemplateLocator class
2011-04-08 18:54:19 +02:00
Victor Berchet
27a327e0de
[FrameworkBundle] Add unit tests for the TemplateLocator class
2011-04-08 18:54:19 +02:00
Victor Berchet
87000a163b
[TwigBundle] Fix the cache warmer
2011-04-08 18:54:19 +02:00
Victor Berchet
e1ab14ba08
[TwigBundle] Tweak cache warmer configuration
2011-04-08 18:54:19 +02:00
Victor Berchet
7cc51d8596
[FrameworkBundle] Fix resource inheritance in the template cache warmer
2011-04-08 18:54:19 +02:00
Fabien Potencier
d91a0747ec
[WebProfilerBundle] fixed button names to be more consistent with others
2011-04-08 17:56:08 +02:00
Fabien Potencier
1e03ff0632
Merge remote branch 'schmittjoh/cssfix'
...
* schmittjoh/cssfix:
[FrameworkBundle] made css rule a bit more conservative
2011-04-08 17:54:29 +02:00
Fabien Potencier
9ceec87eb8
[DomCrawler] fixed various bug with URIs
2011-04-08 17:52:43 +02:00
Johannes M. Schmitt
6408d5fc03
[FrameworkBundle] made css rule a bit more conservative
2011-04-08 17:49:56 +02:00
Fabien Potencier
a230090537
removed some json_encode() calls to use the new getLogicalName() method instead
2011-04-08 17:28:27 +02:00
Fabien Potencier
5558ee24c7
Merge remote branch 'hason/logicalname'
...
* hason/logicalname:
[Templating] changed __toString method (synonym for getLogicalName method)
[Templating] fixed phpdoc a test
[FrameworkBundle] added getLogicalName() method to TemplateReference
[Templating] added method to return the template logical name, added test
2011-04-08 17:22:11 +02:00
Fabien Potencier
7018335ae8
Merge remote branch 'stof/monolog'
...
* stof/monolog:
[MonologBundle][BC break] Renamed the type to fingers_crossed and rotating_file
[MonologBundle] Refactored the configuration to allow adding handlers
2011-04-08 16:56:56 +02:00
Martin Hason
185144bc46
[Templating] changed __toString method (synonym for getLogicalName method)
2011-04-08 11:33:35 +02:00
Martin Hason
20c5db2197
[Templating] fixed phpdoc a test
2011-04-08 11:24:28 +02:00
Martin Hason
6c4801945e
[FrameworkBundle] added getLogicalName() method to TemplateReference
2011-04-08 10:32:46 +02:00
Martin Hason
6b5d991685
[Templating] added method to return the template logical name, added test
2011-04-08 10:31:47 +02:00
Victor Berchet
ceb2c976de
[HttpKernel] Fix the case where no resource is found
2011-04-08 08:52:03 +02:00
Fabien Potencier
a46c2aa68c
Merge remote branch 'kriswallsmith/mongodb/logger-null-fix'
...
* kriswallsmith/mongodb/logger-null-fix:
[DoctrineMongoDBBundle] fixed logging of null values
2011-04-08 07:31:47 +02:00
Fabien Potencier
0abeaf1a38
Merge remote branch 'weaverryan/template_locator_better_exception'
...
* weaverryan/template_locator_better_exception:
[FrameworkBundle] Taking advantage of the known type of $template to render meaningfull information about the template
2011-04-08 07:31:33 +02:00
Johannes Schmitt
5a4ffcd8b6
[Security] re-added some parameters
2011-04-08 07:24:42 +02:00