Permalink
Commits on May 7, 2012
  1. Merge branch '2.0'

    weaverryan committed May 7, 2012
    Conflicts:
    	contributing/code/patches.rst
  2. Merge pull request #1337 from WouterJ/2.0

    weaverryan committed May 7, 2012
    [Book/testing] Added a missing > at the PHPunit configuration code
  3. Merge pull request #1332 from symfony/code-contribution

    weaverryan committed May 7, 2012
    Code contribution
  4. Merge pull request #1330 from odolbeau/virtual_forms

    weaverryan committed May 7, 2012
    Write "Use virtuals forms" cookbook
  5. [reference] Adding a link to the new event listener article and remov…

    weaverryan committed May 7, 2012
    …ing now-duplicated content - see #1325
  6. Merge pull request #1323 from alexandresalome/channels-handlers

    weaverryan committed May 7, 2012
    Channels handlers
Commits on May 2, 2012
Commits on May 1, 2012
  1. Merge pull request #1335 from richardmiller/cleaning_up_di_definitions

    weaverryan committed May 1, 2012
    Cleaning up di definitions
Commits on Apr 30, 2012
  1. refactored the code contribution chapter and added more detailed info…

    fabpot committed Apr 30, 2012
    …rmation about the process
  2. Merge pull request #1328 from symfony/doc-update

    weaverryan committed Apr 30, 2012
    added info about when the symfony.com is updated
Commits on Apr 29, 2012
  1. Reversing the removal of 2.1 features that was done on the 2.0 branch…

    weaverryan committed Apr 29, 2012
    … (after a few 2.1 features slipped into that branch in the components).
    
    Revert "[2.1] Removing a few things for 2.1 that slipped into the 2.0 docs. I'll merge this commit into master (since 2.0 always merges into master), but then revert it"
    
    This reverts commit 6e11de6.
    
    Conflicts:
    
    	components/process.rst
  2. This is a temporary merge - 2.1 features were removed from 2.0, and t…

    weaverryan committed Apr 29, 2012
    …his merges the "undo" of those changes to master. I'll reverse this on the next commit
    
    Merge branch '2.0'
    
    Conflicts:
    	components/http_foundation/introduction.rst
    	components/process.rst
  3. [2.1] Removing a few things for 2.1 that slipped into the 2.0 docs. I…

    weaverryan committed Apr 29, 2012
    …'ll merge this commit into master (since 2.0 always merges into master), but then revert it
  4. Merge branch '2.0'

    weaverryan committed Apr 29, 2012
    Conflicts:
    	book/templating.rst
  5. Fixing various broken or redirecting (because of permanent moves) lin…

    weaverryan committed Apr 29, 2012
    …ks throughout the docs
  6. Merge branch '2.0'

    weaverryan committed Apr 29, 2012
    Conflicts:
    	book/page_creation.rst
    	cookbook/testing/doctrine.rst
    	quick_tour/the_architecture.rst
    	reference/configuration/security.rst
    	reference/dic_tags.rst
    
    Also relates to #1320
  7. Removing "The Model". It was causing escaping problems, and I don't t…

    weaverryan committed Apr 29, 2012
    …hink it's really necessary to point out that this is the model (when technically it really isn't completely the model).
    
    See #1264 and #1307
  8. Merge pull request #1321 from klaussilveira/2.0

    weaverryan committed Apr 29, 2012
    Fixes #968 and #1005
  9. Wrapping all YAML parameter % uses with quotes. Without quotes, the c…

    weaverryan committed Apr 29, 2012
    …olors do not render correctly - see #945
  10. Fixes #1005

    klaussilveira committed Apr 29, 2012