Permalink
Commits on Nov 23, 2013
  1. Merge branch '2.3'

    weaverryan committed Nov 23, 2013
    Conflicts:
    	components/stopwatch.rst
    	cookbook/security/custom_authentication_provider.rst
Commits on Nov 22, 2013
  1. Merge branch '2.2' into 2.3

    weaverryan committed Nov 22, 2013
    Conflicts:
    	book/page_creation.rst
    	components/filesystem.rst
    	components/form/introduction.rst
    	components/locale.rst
    	cookbook/form/dynamic_form_modification.rst
    	cookbook/form/unit_testing.rst
    	cookbook/form/use_virtuals_forms.rst
    	cookbook/service_container/scopes.rst
Commits on Nov 21, 2013
  1. [#3198] Minor tweaks

    weaverryan committed Nov 21, 2013
  2. Fix PHP requirement in installation documentation

    gnutix committed with weaverryan Nov 17, 2013
    Changed minimal PHP requirement from 5.3.8 to 5.3.3, as it's the version required in composer for symfony/symfony. If 5.3.8 (or higher) is the recommended one, I'll suggest to add a comment about it.
Commits on Nov 20, 2013
  1. fixing two small syntax errors

    xabbuh committed with weaverryan Nov 17, 2013
Commits on Nov 18, 2013
  1. Fixing syntax error

    weaverryan committed Nov 18, 2013
  2. Merge branch 'fix_proper_nouns_and_some_formatting' of github.com:bic…

    weaverryan committed Nov 18, 2013
    …pi/symfony-docs into bicpi-fix_proper_nouns_and_some_formatting
    
    Conflicts:
    	components/serializer.rst
    	cookbook/form/unit_testing.rst
  3. Merge branch 'component_names_consistency' of github.com:bicpi/symfon…

    weaverryan committed Nov 18, 2013
    …y-docs into bicpi-component_names_consistency
    
    Conflicts:
    	book/translation.rst
Commits on Nov 17, 2013
  1. fix WSSE notation

    bicpi committed Nov 17, 2013
  2. Fix HTTPS and Ajax notation

    bicpi committed Nov 17, 2013
Commits on Nov 16, 2013
  1. Merge pull request #3044 from WouterJ/document_expressionlanguage

    weaverryan committed Nov 16, 2013
    [WIP] Add docs for ExpressionLanguage component
  2. Merge branch '2.3'

    weaverryan committed Nov 16, 2013
  3. Merge branch '2.2' into 2.3

    weaverryan committed Nov 16, 2013
  4. Merge branch '2.1' into 2.2

    weaverryan committed Nov 16, 2013
    Conflicts:
    	contributing/documentation/standards.rst
  5. Merge branch '2.0' into 2.1

    weaverryan committed Nov 16, 2013
  6. Merge pull request #2994 from WouterJ/namespace_standards

    weaverryan committed Nov 16, 2013
    Added some doc standards
  7. Merge branch '2.3'

    weaverryan committed Nov 16, 2013
    Conflicts:
    	book/translation.rst
    	reference/constraints/Image.rst
  8. Merge branch '2.2' into 2.3

    weaverryan committed Nov 16, 2013
    Conflicts:
    	book/translation.rst
    	reference/constraints/Max.rst
    	reference/constraints/MaxLength.rst
    	reference/constraints/Min.rst
    	reference/constraints/MinLength.rst
  9. Merge pull request #3190 from symfony/WouterJ-document_translation_22

    weaverryan committed Nov 16, 2013
    Wouter j document translation 22
  10. [#2906] Final massive proofread of the translation book-component split

    weaverryan committed Nov 16, 2013
    Some things that were moved to the components were moved back in part to the book so that it still feels complete.
    
    I also took this opportunity to tweak some things to make them more understandable.
  11. Fixes

    wouterj committed with weaverryan Aug 24, 2013
  12. Added new 2.2 features

    wouterj committed with weaverryan Aug 18, 2013
  13. Reread book article

    wouterj committed with weaverryan May 19, 2013
  14. Reread usage docs

    wouterj committed with weaverryan May 19, 2013