Kris Wallsmith
9ff2ca7f1d
[Validator] fixed apc cache
2011-04-06 04:07:37 -07:00
Fabien Potencier
ae218d202e
Merge remote branch 'vicb/bundle_inheritance'
...
* vicb/bundle_inheritance:
[Kernel] Fix bundle inheritance
2011-04-06 11:29:05 +02:00
Fabien Potencier
f17a588c8f
Merge remote branch 'schmittjoh/security'
...
* schmittjoh/security:
[Security] added another example to update file
[Security] Remove unneeded and invalid use statement
2011-04-06 11:17:39 +02:00
Johannes Schmitt
e281e5121e
Merge branch 'ns_fix' of https://github.com/Seldaek/symfony into security
2011-04-06 10:54:00 +02:00
Johannes Schmitt
19b50d1669
[Security] added another example to update file
2011-04-06 10:53:54 +02:00
Victor Berchet
7707c0f251
[Kernel] Fix bundle inheritance
2011-04-06 07:46:08 +02:00
Kris Wallsmith
eca0243d3e
[FrameworkBundle] added condition so invalid session config isn't created
2011-04-05 15:42:43 -07:00
Jordi Boggiano
e697224efa
[Security] Remove unneeded and invalid use statement
2011-04-05 18:42:00 +02:00
Fabien Potencier
839782b6e4
[FrameworkBundle] added support for routing redirection
2011-04-05 15:21:32 +02:00
Fabien Potencier
e3679ef44f
[Routing] decoupled Routing from FrameworkBundle
2011-04-05 15:21:32 +02:00
Fabien Potencier
00c9539aaa
Merge remote branch 'vicb/config_base'
...
* vicb/config_base:
[Config] Add a note about the ConfigurationInterface interface in UPDATE.md
[MonologBundle] Make The Configuration class implements the ConfigurationInterface
[Config] Introduction of an ConfigurationInterface
2011-04-05 12:32:58 +02:00
Johannes Schmitt
6d4814c115
Merge branch 'acl-fix' of https://github.com/comfortablynumb/symfony into security
2011-04-05 12:25:24 +02:00
Gustavo Adrian
2e96f2c63d
Fixed exception that was thrown while updating a field ACE
2011-04-05 13:05:20 -03:00
Fabien Potencier
372907ead1
[Routing] fixed CS
2011-04-05 12:13:47 +02:00
Fabien Potencier
7c0a39c353
[Routing] optimized the output of the PHP matcher dumper
2011-04-05 11:58:56 +02:00
Victor Berchet
b592946712
[Config] Add a note about the ConfigurationInterface interface in UPDATE.md
2011-04-05 11:53:55 +02:00
Victor Berchet
0973d37202
[MonologBundle] Make The Configuration class implements the ConfigurationInterface
2011-04-05 11:31:38 +02:00
Victor Berchet
b640fcb0f0
[Config] Introduction of an ConfigurationInterface
2011-04-05 11:26:28 +02:00
Fabien Potencier
e6e8d9b03d
[MonologBundle] fixed typo
2011-04-05 10:54:33 +02:00
Fabien Potencier
dfbc0a899d
Merge remote branch 'vicb/link_format'
...
* vicb/link_format:
[Templating] Fix for getting the file link format from XDebug settings
2011-04-05 10:52:50 +02:00
Victor Berchet
170375a946
[Templating] Fix for getting the file link format from XDebug settings
2011-04-05 10:36:11 +02:00
Fabien Potencier
6daf09a61d
Merge remote branch 'subsven/master'
...
* subsven/master:
Add (Boolean) cast to constructor arguments
Add a configuration option to restrict profiler storage to the master request
2011-04-05 10:03:58 +02:00
Fabien Potencier
6faacdec27
[HttpKernel] fixed CS
2011-04-05 09:48:36 +02:00
Fabien Potencier
9bcd49683e
Merge remote branch 'vicb/resource_path'
...
* vicb/resource_path:
Update for Bundle names long again (= include the 'Bundle' suffix)
[Kernel] Make locateResource() throws an exception when a resource from a Bundle hides a custom resource
[Kernel] Make resources overriding consistent across bundle directories and resource directories
[Kernel] Improve test semantic
[Kernel] Update tests with shorter bundle names
[Kernel] Restore the tests for the locateResource method
Resource paths should use the full bundle name (with the 'Bundle' postfix)
2011-04-05 09:42:47 +02:00
Fabien Potencier
68acb02486
Merge remote branch 'vicb/wdtb_css'
...
* vicb/wdtb_css:
[WebProfilerBundle] Tweak the wdtb css
2011-04-05 08:29:24 +02:00
Fabien Potencier
b126c50aea
[FrameworkBundle] fixed CS
2011-04-05 08:24:46 +02:00
Fabien Potencier
9ff8080d9f
Merge remote branch 'danielholmes/phpunit_xml_dir'
...
* danielholmes/phpunit_xml_dir:
[FrameworkBundle] removed function for checking for phpunit.xml in cwd
[FrameworkBundle] fixed error with arg reversing from previous changes
[FrameworkBundle] refactored getPhpUnitXmlDir in to separate parts and added support for --confguration=... style phpunit flag
[FrameworkBundle] fixed getPhpUnitXmlDir to work with directory paths with spaces in them
2011-04-05 08:16:53 +02:00
Fabien Potencier
ea7a87a1b7
[FrameworkBundle] simplified code
2011-04-05 08:10:17 +02:00
Fabien Potencier
515b6e48a0
merged vicb/event_dispatcher
2011-04-05 08:08:57 +02:00
Victor Berchet
6164054972
[WebProfilerBundle] Tweak the wdtb css
2011-04-05 08:05:59 +02:00
Fabien Potencier
9e4ebc951c
Merge remote branch 'kriswallsmith/assetic/filter-file'
...
* kriswallsmith/assetic/filter-file:
[AsseticBundle] added easy way to add a file to a filter definition
2011-04-05 08:04:11 +02:00
Fabien Potencier
747c98f178
[FrameworkBundle] removed the debug.file_link_format parameter
2011-04-05 08:03:29 +02:00
Fabien Potencier
4d4876d9ba
Merge remote branch 'vicb/file_link_format'
...
* vicb/file_link_format:
[FrameworkBundle] Make specifying a custom file_link_format easier
[FrameworkBundle] Fix for getting the file link format fallback to XDebug configuration
2011-04-05 07:57:07 +02:00
Fabien Potencier
87f808757d
[WebProfileBundle] replaced an inclusion with a macro
2011-04-05 07:54:07 +02:00
Fabien Potencier
c2880378b9
Revert "[WebProfilerBundle] Tweak html markup and css"
...
This reverts commit 60b96e7c57
.
I want to be able to display several toolbars on the same page
2011-04-05 07:51:32 +02:00
Fabien Potencier
d61a685786
Merge remote branch 'vicb/wdtb_and_events'
...
* vicb/wdtb_and_events:
[WebProfilerBundle] Event panel: details & links to the listener method when applicable
[WebProfilerBundle] Tweak html markup and css
[WebProfilerBundle] Update the event panel layout
[WebProfilerBundle] Style abbr elements
2011-04-05 07:46:34 +02:00
Ryan Weaver
22beeb2549
[TwigBundle] Cleaning up several portions of the exception message received when a template cannot be loaded
...
* The quotations are redundant when the template is a string - json_encode() adds the quotes
* The exception should not end in a period, as the exception class may add a line number (not in this case, but generall)
* Made the line number -1, so that no line number was displayed in the message (error at line 0 looks worse than nothing at all)
2011-04-04 21:35:00 -05:00
Victor Berchet
b5f3d14714
[WebProfilerBundle] Event panel: details & links to the listener method when applicable
2011-04-05 01:23:31 +02:00
Victor Berchet
5a1d5e5082
[FrameworkBundle] Make specifying a custom file_link_format easier
2011-04-05 01:15:21 +02:00
Victor Berchet
9998ab18e9
[FrameworkBundle] Fix for getting the file link format fallback to XDebug configuration
2011-04-04 23:39:37 +02:00
Victor Berchet
60b96e7c57
[WebProfilerBundle] Tweak html markup and css
2011-04-04 23:09:43 +02:00
Kris Wallsmith
4e5c0b1da9
[AsseticBundle] added easy way to add a file to a filter definition
2011-04-04 13:47:32 -07:00
Victor Berchet
1f1ee3cb01
[WebProfilerBundle] Update the event panel layout
2011-04-04 20:15:39 +02:00
Victor Berchet
b95295caac
[FrameworkBundle] A listener is always an object
2011-04-04 19:51:14 +02:00
Victor Berchet
f58658f929
[WebProfilerBundle] Style abbr elements
2011-04-04 19:28:09 +02:00
Victor Berchet
46480b7e89
[FrameworkBundle] Fix the traceable event dispatcher
2011-04-04 19:22:55 +02:00
Fabien Potencier
dd150fc478
Merge remote branch 'vicb/twig_warmer'
...
* vicb/twig_warmer:
[TwigBundle] Update the cache warmer
2011-04-04 18:52:56 +02:00
Fabien Potencier
fe43e1b759
Merge remote branch 'lsmith77/default_namespace2'
...
* lsmith77/default_namespace2:
added default implementation for getNamespace()
2011-04-04 18:46:30 +02:00
Fabien Potencier
dbfe73bef4
Merge remote branch 'vicb/gitkeep'
...
* vicb/gitkeep:
[FrameworkBundle] Delete .gitkeep files
2011-04-04 18:45:25 +02:00
Fabien Potencier
ae2629ce30
merged vicb/profiler_verbose
2011-04-04 18:43:33 +02:00