Permalink
Commits on Apr 4, 2011
  1. Merge remote branch 'vicb/twig_warmer'

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

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

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

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

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

    fabpot committed Apr 4, 2011
  8. updated UPDATE file

    fabpot committed Apr 4, 2011
  9. [ZendBundle] removed the bundle

    fabpot committed Apr 4, 2011
  10. merged stof/monolog

    fabpot committed Apr 4, 2011
  11. 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
    fabpot committed Apr 4, 2011
  12. Merge remote branch 'vicb/cache_template'

    * vicb/cache_template:
      [FrameworkBundle] Fix the cache template loader
    fabpot committed Apr 4, 2011
  13. updated UPDATE

    fabpot committed Apr 4, 2011
  14. Revert "[FrameworkBundle] Updated the files generated by init:bundle …

    …to use the new bundle logical names"
    
    This reverts commit d0e2b5b.
    fabpot committed Apr 4, 2011
  15. updated UPDATE

    fabpot committed Apr 4, 2011
  16. Revert "fixed remaining Bundle suffixes"

    This reverts commit 315147c.
    fabpot committed Apr 4, 2011
  17. Revert "[HttpKernel] updated tests for shorter bundle names"

    This reverts commit fb7e87d.
    fabpot committed Apr 4, 2011
  18. Revert "[FrameworkBundle] fixed shorter bundle name in test"

    This reverts commit d1f3852.
    fabpot committed Apr 4, 2011
  19. Merge remote branch 'FabienPennequin/assetic_update.md'

    * FabienPennequin/assetic_update.md:
      Updated file UPDATE.md for assetic filters
    fabpot committed Apr 4, 2011
  20. Merge remote branch 'Seldaek/serializer'

    * Seldaek/serializer:
      [Serializer] Some more privates
      [Serializer] Move private methods below protected ones
      [Serializer] Added @api annotations
      [Serializer] Added docblocks for NormalizableInterface
      [Serializer] add methods to the SerializerInterface
      [Serializer] Added docblock
      [Serializer] Switched most protected to private or final
    fabpot committed Apr 4, 2011
  21. Merge remote branch 'Seldaek/ajax_redir'

    * Seldaek/ajax_redir:
      [WebProfilerBundle] Prevent redirects to be intercepted in XHRs
    fabpot committed Apr 4, 2011
Commits on Apr 3, 2011
  1. [Console] made ApplicationTester::getDisplay() work even in case of a…

    …n error during execution and changed returned value of ApplicationTester to the command exit code
    fabpot committed Apr 3, 2011
  2. [Console] made CommandTester::getDispaly() work even in case of an er…

    …ror during execution
    fabpot committed Apr 3, 2011
  3. Updated XSD schema

    francisbesset committed Apr 3, 2011