Permalink
Commits on Jul 15, 2012
  1. Revert "raised the minimum version of PHP"

    This reverts commit 6f2dc2b.
    fabpot committed Jul 15, 2012
  2. Merge branch '2.0'

    weaverryan committed Jul 15, 2012
  3. Fixing typo - thanks @stof!

    weaverryan committed Jul 15, 2012
  4. Merge pull request #1539 from gajdaw/finder_contents

    [Component][Finder]: info about getContents()
    weaverryan committed Jul 15, 2012
  5. Merge pull request #1509 from hansallis/entity_type_groupby

    [Reference/Form types/entity] Described group_by option
    weaverryan committed Jul 15, 2012
  6. Merge pull request #1542 from michaelperrin/twig_reference_fix

    [Twig reference] Changed the way label attributes are passed in examples
    weaverryan committed Jul 15, 2012
  7. Merge branch '2.0'

    weaverryan committed Jul 15, 2012
Commits on Jul 14, 2012
  1. Minor tweaks for #1556

    weaverryan committed Jul 14, 2012
  2. Merge branch 'cookbook_routing_nocontroller' of git://github.com/tack…

    …er/symfony-docs into tacker-cookbook_routing_nocontroller
    
    Conflicts:
    	cookbook/index.rst
    	cookbook/map.rst.inc
    weaverryan committed Jul 14, 2012
  3. Merge pull request #1554 from ampt/fix_typos

    Fix some minor typos
    weaverryan committed Jul 14, 2012
  4. Merge branch '2.0'

    weaverryan committed Jul 14, 2012
  5. [components][config] Tweaks for #1550 - mostly making lines shorter, …

    …other small tweaks
    weaverryan committed Jul 14, 2012
  6. Fixing syntax error

    weaverryan committed Jul 14, 2012
  7. Merge pull request #1543 from richardmiller/adding_injection_types

    Added page to dependency injection component section on types of injection
    weaverryan committed Jul 14, 2012
  8. Merge branch '2.0'

    weaverryan committed Jul 14, 2012
  9. Minor english tweak for #1549

    weaverryan committed Jul 14, 2012
  10. Merge pull request #1549 from WouterJ/clearify_extending_bundles

    Clearify the goal of Bundle::getParent()
    weaverryan committed Jul 14, 2012
  11. Merge branch '2.0'

    Conflicts:
    	cookbook/form/data_transformers.rst
    weaverryan committed Jul 14, 2012
  12. Changing appendNormTransformer to prepend - prepend is the "normal" p…

    …osition, and the one used by default in 2.1 with addModelTransformer - thanks to @stof
    weaverryan committed Jul 14, 2012
  13. Merge branch '2.0'

    weaverryan committed Jul 14, 2012