Permalink
Commits on Nov 28, 2012
  1. [#1980] Slight reword

    weaverryan committed Nov 28, 2012
  2. Merge pull request #1980 from WouterJ/add_note_route_di_params

    Added note about Service Container parameters inside routes
    weaverryan committed Nov 28, 2012
  3. Merge pull request #1973 from greg0ire/document_mapped

    Document the mapped form type option
    weaverryan committed Nov 28, 2012
Commits on Nov 27, 2012
  1. Point out what is deprecated

    greg0ire committed Nov 27, 2012
Commits on Nov 26, 2012
  1. fix copy paste mistake

    greg0ire committed Nov 26, 2012
  2. Merge branch '2.0' into 2.1

    Conflicts:
    	reference/forms/types/collection.rst
    	reference/twig_reference.rst
    weaverryan committed Nov 26, 2012
  3. Merge pull request #1968 from richardmiller/changin_our_use

    Changing some uses of let's
    weaverryan committed Nov 26, 2012
  4. Fixing a few bad links

    weaverryan committed Nov 26, 2012
  5. [#1962] Slight language tweak

    weaverryan committed Nov 26, 2012
  6. Merge pull request #1962 from WouterJ/twig_ref_21

    Added Twig extensions that are new in 2.1
    weaverryan committed Nov 26, 2012
  7. whitespace

    greg0ire committed Nov 26, 2012
  8. Merge pull request #1953 from WouterJ/correct_named_twig_arguments

    Changed wrong argument names
    weaverryan committed Nov 26, 2012
  9. [#1933] Fixing bad chmod call

    weaverryan committed Nov 26, 2012
  10. just a typo

    philipphoffmann committed with weaverryan Nov 25, 2012
  11. Merge pull request #1971 from iamdto/missing-bracket

    Added missing bracket
    weaverryan committed Nov 26, 2012
  12. Merge pull request #1969 from richardmiller/fixing_line_lengths

    Reducing some code sample line lengths to stop horizontal scrolling
    weaverryan committed Nov 26, 2012
  13. Merge pull request #1970 from richardmiller/fixing_code_line_lengths

    Reducing some code sample line lengths to stop horizontal scrolling
    weaverryan committed Nov 26, 2012
  14. Updating some links

    weaverryan committed Nov 26, 2012
  15. Merge pull request #1967 from WouterJ/patch-15

    Changed normal links to special :php*: links
    weaverryan committed Nov 26, 2012
  16. Fixed a typo

    DenisGorbachev committed with weaverryan Nov 24, 2012
  17. Merge pull request #1966 from bicpi/add_role_previous_admin_explanation

    [Security] description for special role ROLE_PREVIOUS_ADMIN
    weaverryan committed Nov 26, 2012
  18. Extra blank line

    weaverryan committed Nov 26, 2012
  19. Update contributing/code/standards.rst

    Included suggestions by WouterJ.
    
    @param and @return should be separated by a single blank line (SF 2).
    
    Demonstration of trailing `,` for arrays should have a higher priority than the otherwise recommended single-line array notation (`array('key' => 'value')` in favour of `array('key' => 'value', )`).
    
    Multi-line function call syntax as suggested for SF2 is not PSR-2 conform. It may be required to consider more examples or discuss that rule at a higher level.
    goatherd committed with weaverryan Nov 24, 2012
  20. PSR-2 conformity and missing class doc block.

    Example missing class doc block. Example was not psr-2 conform (only one argument allowed per line for a multi-line function call).
    
    Can't add the final line feed to the example thought.
    goatherd committed with weaverryan Nov 24, 2012
  21. Rename Listener to EventListener #1924

    Renamed the file structure to EventListener in accordance with http://symfony.com/doc/master/cookbook/bundles/best_practices.html.
    This fixes #1924.
    peterrehm committed with weaverryan Nov 24, 2012
  22. Merge branch '2.0' into 2.1

    weaverryan committed Nov 26, 2012