Permalink
Commits on Mar 25, 2013
  1. Merge pull request #2342 from fabpot/progress-helper

    added a note about the new setCurrent method on the progress helper
    weaverryan committed Mar 25, 2013
Commits on Mar 23, 2013
Commits on Mar 15, 2013
  1. Merge pull request #2283 from symfony/2.2-update-urls

    [2.2] Updating some URLs from 2.1/master to 2.2
    weaverryan committed Mar 15, 2013
  2. Update twig_reference.rst

    | Q             | A
    | ------------- | ---
    | Doc fix?      | yes
    | New docs?     | no
    | Applies to    | all
    | Fixed tickets |
    
    Fixes typo
    Halleck45 committed with weaverryan Mar 5, 2013
Commits on Mar 12, 2013
  1. Merge pull request #2294 from janschoenherr/patch-2

    Update introduction.rst
    weaverryan committed Mar 12, 2013
  2. Merge pull request #2297 from michaelperrin/fix/ref-UniquePassword-depr

    [Reference] [UserPassword] Use the non-deprecated class for Symfony 2.2
    weaverryan committed Mar 12, 2013
Commits on Mar 11, 2013
Commits on Mar 10, 2013
  1. Update introduction.rst

    janschoenherr committed Mar 10, 2013
Commits on Mar 8, 2013
  1. Merge branch '2.1' into 2.2

    Conflicts:
    	cookbook/configuration/apache_router.rst
    	reference/twig_reference.rst
    weaverryan committed Mar 8, 2013
  2. Merge branch '2.0' into 2.1

    Conflicts:
    	cookbook/form/create_custom_field_type.rst
    	cookbook/form/create_form_type_extension.rst
    	cookbook/logging/monolog.rst
    	cookbook/security/custom_authentication_provider.rst
    	reference/constraints/Email.rst
    	reference/constraints/Valid.rst
    weaverryan committed Mar 8, 2013
  3. Merge branch 'add_missing_formats' of github.com:WouterJ/symfony-docs…

    … into WouterJ-add_missing_formats
    
    Conflicts:
    	cookbook/security/custom_authentication_provider.rst
    weaverryan committed Mar 8, 2013
  4. Merge pull request #2247 from WouterJ/reorderd_config_blocks

    [Constraints] Fixed incosistenties and reordered config blocks
    weaverryan committed Mar 8, 2013
Commits on Mar 4, 2013
  1. Fixed issues and typos in new formats

    Fixed issues by @stof
    Fixed typo
    wouterj committed Feb 18, 2013
  2. Merge branch '2.0' into 2.1

    weaverryan committed Mar 4, 2013
  3. [#2217] Tweaks to new entry about overriding kernel configuration by @…

    …WouterJ. Thanks to @Stof for some of the details here.
    weaverryan committed Mar 4, 2013
  4. Merge pull request #2217 from WouterJ/ref_kernel_config

    [Reference] Document AppKernel config settings
    weaverryan committed Mar 4, 2013
  5. [#2202] Slight fixes - misnamed target and missing names for the targ…

    …ets (since there is no header beneath the target)
    weaverryan committed Mar 4, 2013
  6. Merge pull request #2202 from WouterJ/trans_domain_twig

    Added trans_default_domain tag to twig reference and some formatting
    weaverryan committed Mar 4, 2013
Commits on Feb 27, 2013
  1. Merge branch '2.1'

    weaverryan committed Feb 27, 2013
  2. Merge branch '2.0' into 2.1

    weaverryan committed Feb 27, 2013
  3. Merge branch '2.0' of github.com:hansallis/symfony-docs into hansalli…

    …s-2.0
    
    Conflicts:
    	reference/forms/types/collection.rst
    weaverryan committed Feb 27, 2013
  4. Update reference/configuration/framework.rst

    know -> known
    luiges90 committed with weaverryan Feb 25, 2013
  5. Merge pull request #2263 from symfony/assetic

    Assetic
    weaverryan committed Feb 27, 2013
  6. [Assetic] Proofreading the Assetic section, rewriting parts, adding m…

    …ore details, evolving it
    weaverryan committed Feb 23, 2013
  7. Realigned =>

    vmattila committed with weaverryan Feb 23, 2013