Commit Graph

3540 Commits

Author SHA1 Message Date
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
Fabien Potencier
60dd810e3f [DoctrineBundle] fixed unit tests 2011-04-04 18:35:29 +02:00
Fabien Potencier
b1e0403c96 Merge remote branch 'francisbesset/doctrine_orm_custom_hydrator'
* francisbesset/doctrine_orm_custom_hydrator:
  [DoctrineBundle] Added tests for add custom hydration mode
  Updated XSD schema
  Moved hydrators configuration in entity manager
  [DoctrineBundle] Added custom hydrator for the EntityManager from configuration
2011-04-04 18:31:55 +02:00
Victor Berchet
852d5c37df [FrameworkBundle] Delete .gitkeep files 2011-04-04 17:40:18 +02:00
hidenorigoto
30e7eae4a9 updated UPDATE.ja file 2011-04-05 00:32:09 +09:00
Fabien Potencier
9fe9d80371 [MonologBundle] fixed typo 2011-04-04 14:56:42 +02:00
Fabien Potencier
7be61bd72a updated UPDATE file 2011-04-04 12:45:31 +02:00
Fabien Potencier
117b6997b4 [WebProfilerBundle] removed redundant info 2011-04-04 12:45:25 +02:00
Fabien Potencier
5bd2b53cb8 [ZendBundle] removed the bundle 2011-04-04 12:41:27 +02:00
Fabien Potencier
01ee1bfed1 merged stof/monolog 2011-04-04 12:29:15 +02:00
Fabien Potencier
f4276a88f6 Merge remote branch 'schmittjoh/parameterCleanup'
* schmittjoh/parameterCleanup:
  [SecurityBundle] inline parameters which are only used in one place
  [SecurityBundle] moved all non-class parameters to the Configuration file
2011-04-04 11:57:31 +02:00
Fabien Potencier
1cb03b1448 [FrameworkBundle] removed templating.loader.cache.path parameter 2011-04-04 11:56:41 +02:00
Fabien Potencier
1fd44ea736 Merge remote branch 'vicb/cache_template'
* vicb/cache_template:
  [FrameworkBundle] Fix the cache template loader
2011-04-04 11:49:13 +02:00
Fabien Potencier
7ff4e54748 updated UPDATE 2011-04-04 11:44:58 +02:00
Fabien Potencier
49a7f525b9 Revert "[FrameworkBundle] Updated the files generated by init:bundle to use the new bundle logical names"
This reverts commit d0e2b5b611.
2011-04-04 11:42:52 +02:00
Victor Berchet
5317c96fef Update for Bundle names long again (= include the 'Bundle' suffix) 2011-04-04 11:39:41 +02:00
Fabien Potencier
a60a9af53f updated UPDATE 2011-04-04 11:36:28 +02:00
Victor Berchet
7ed18bf829 [Kernel] Make locateResource() throws an exception when a resource from a Bundle hides a custom resource 2011-04-04 11:24:51 +02:00
Victor Berchet
3cd3dd39ba [Kernel] Make resources overriding consistent across bundle directories and resource directories 2011-04-04 11:24:51 +02:00
Victor Berchet
d0b6ed2bb6 [Kernel] Improve test semantic 2011-04-04 11:24:51 +02:00