Permalink
Commits on Dec 8, 2013
  1. Merge branch 'master' into eom-2-2

    Conflicts:
    	book/security.rst
    	components/property_access/introduction.rst
    	components/stopwatch.rst
    	cookbook/templating/namespaced_paths.rst
    	reference/twig_reference.rst
    weaverryan committed Dec 8, 2013
Commits on Dec 3, 2013
  1. Merge branch '2.3' into 2.4

    weaverryan committed Dec 3, 2013
  2. Merge branch '2.2' into 2.3

    Conflicts:
    	book/security.rst
    weaverryan committed Dec 3, 2013
  3. Merge pull request #3259 from symfony/security-access-control

    Security access_control reword
    weaverryan committed Dec 3, 2013
  4. fixes #3267

    Make sure we use camelCase for action arguments
    greg0ire committed Dec 3, 2013
  5. changed version from 2.3.0 --> 2.3.7

    just for convenience (i.e. people not reading the text carefully but copying the example and starting with an "old" Symfony version)
    luebbert42 committed with weaverryan Dec 1, 2013
  6. Merge pull request #3256 from WouterJ/clarify_checking

    [#3255] Tried to clarify how to check a box
    weaverryan committed Dec 3, 2013
  7. Merge pull request #3260 from WouterJ/component_expression_caching

    [ExpressionLanguage] Documented Caching Strategies
    weaverryan committed Dec 3, 2013
Commits on Dec 2, 2013
  1. Merge pull request #3261 from zczapran/2.4

    [Cookbook] Fixes a link to the Request class
    weaverryan committed Dec 2, 2013
  2. Added doctrine note

    wouterj committed Dec 2, 2013
  3. Added Caching article

    wouterj committed Dec 2, 2013
  4. Rewording security sections to be even more clear that secure_channel…

    … and ip don't actually *restrict* access
    weaverryan committed Dec 2, 2013
  5. Merge pull request #3258 from symfony/expression-language-framework

    Final additions: Expression language framework docs
    weaverryan committed Dec 2, 2013
Commits on Dec 1, 2013
  1. [#3022] Adding a quick cookbook entry to highlight where the expressi…

    …on component is used in the framework
    weaverryan committed Dec 1, 2013
  2. Merge branch '2.3' into 2.4

    Conflicts:
    	book/security.rst
    	components/security/authentication.rst
    	components/translation/introduction.rst
    weaverryan committed Dec 1, 2013
  3. Merge branch '2.2' into 2.3

    Conflicts:
    	cookbook/configuration/environments.rst
    	reference/forms/types/locale.rst
    weaverryan committed Dec 1, 2013
  4. Merge pull request #3254 from WouterJ/fix_link

    Fixed link syntax
    weaverryan committed Dec 1, 2013
  5. Merge pull request #3253 from sstok/path-3

    [reference] fixed wrong class reference in form/types/locale.rst
    weaverryan committed Dec 1, 2013
  6. Merge pull request #3250 from bicpi/asterisk_alternative_for_required…

    …_form_fields
    
    [Cookbook][Forms] Add Asterisk alternative using CSS
    weaverryan committed Dec 1, 2013
  7. Merge pull request #3249 from bicpi/improve_ISO_references

    Improve ISO references
    weaverryan committed Dec 1, 2013
  8. Merge pull request #3247 from bicpi/update_minifier_recommendation

    [Cookbook][Assetic] Update JS minifier recommendation
    weaverryan committed Dec 1, 2013
  9. Merge pull request #3246 from bicpi/fix_statement

    [Cookbook][Console] Fix statement
    weaverryan committed Dec 1, 2013
  10. [#3245] Removing most of the front controller code altogether

    This removes code that could easily become out of date again. Also, I don't think
    it was necessary - we want to focus them on only one line anyways.
    weaverryan committed Dec 1, 2013
  11. Merge pull request #3245 from bicpi/fix_front_controller_code

    [Cookbook][Configuration] Fix front controller sample codes
    weaverryan committed Dec 1, 2013