Permalink
Commits on Apr 5, 2011
  1. 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
    fabpot committed Apr 5, 2011
  2. [HttpKernel] fixed CS

    fabpot committed Apr 5, 2011
  3. 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)
    fabpot committed Apr 5, 2011
  4. Merge remote branch 'vicb/wdtb_css'

    * vicb/wdtb_css:
      [WebProfilerBundle] Tweak the wdtb css
    fabpot committed Apr 5, 2011
  5. [FrameworkBundle] fixed CS

    fabpot committed Apr 5, 2011
  6. 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
    fabpot committed Apr 5, 2011
  7. merged vicb/event_dispatcher

    fabpot committed Apr 5, 2011
  8. Merge remote branch 'kriswallsmith/assetic/filter-file'

    * kriswallsmith/assetic/filter-file:
      [AsseticBundle] added easy way to add a file to a filter definition
    fabpot committed Apr 5, 2011
  9. 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
    fabpot committed Apr 5, 2011
  10. Revert "[WebProfilerBundle] Tweak html markup and css"

    This reverts commit 60b96e7.
    
    I want to be able to display several toolbars on the same page
    fabpot committed Apr 5, 2011
  11. 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
    fabpot committed Apr 5, 2011
  12. [TwigBundle] Cleaning up several portions of the exception message re…

    …ceived 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)
    weaverryan committed Apr 5, 2011
Commits on Apr 4, 2011
  1. [WebProfilerBundle] Event panel: details & links to the listener meth…

    …od when applicable
    vicb committed Apr 4, 2011
  2. [FrameworkBundle] Fix for getting the file link format fallback to XD…

    …ebug configuration
    vicb committed Apr 4, 2011
  3. Merge remote branch 'vicb/twig_warmer'

    * vicb/twig_warmer:
      [TwigBundle] Update the cache warmer
    fabpot committed Apr 4, 2011
  4. Merge remote branch 'lsmith77/default_namespace2'

    * lsmith77/default_namespace2:
      added default implementation for getNamespace()
    fabpot committed Apr 4, 2011
  5. Merge remote branch 'vicb/gitkeep'

    * vicb/gitkeep:
      [FrameworkBundle] Delete .gitkeep files
    fabpot committed Apr 4, 2011
  6. merged vicb/profiler_verbose

    fabpot committed Apr 4, 2011
  7. 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
    fabpot committed Apr 4, 2011
  8. updated UPDATE.ja file

    hidenorigoto committed Apr 4, 2011
  9. [MonologBundle] fixed typo

    fabpot committed Apr 4, 2011
  10. updated UPDATE file

    fabpot committed Apr 4, 2011