Permalink
Commits on Jun 25, 2012
  1. Ignoring network tests for while. The Email need to be fixed to read …

    …the config more properly using namespace
    committed Jun 25, 2012
  2. Fixed namespaces

    committed Jun 25, 2012
Commits on Jun 24, 2012
  1. Lazy loading objects and file map once it should not be used anymore …

    …in most of the requests
    committed Jun 24, 2012
  2. Added tests for App::classname

    committed Jun 24, 2012
  3. Merge remote-tracking branch 'cakephp/2.2' into 3.0-namespace

    Conflicts:
    	lib/Cake/Console/Command/CommandListShell.php
    	lib/Cake/Error/exceptions.php
    	lib/Cake/Model/Datasource/DboSource.php
    	lib/Cake/Model/Model.php
    	lib/Cake/Test/TestCase/Error/ExceptionRendererTest.php
    	lib/Cake/Utility/Time.php
    committed Jun 24, 2012
  4. Optimization for Hash method

    committed Jun 24, 2012
  5. Fix Controller::beforeRedirect() and array return.

    Array return values from Controller::beforeRedirect() would be
    incorrectly handled causing wrong URL's to be generated.
    
    Fixes #2973
    markstory committed Jun 24, 2012
  6. Fix fatal error when E_STRICT is enabled.

    If you have E_STRICT enabled and have a strict error in your files, you
    would see a fatal error related to Debugger missing.  PHP won't autoload
    classes if you are currently in an autoload call, and an error is
    triggered.  Preloading Debugger + String in dev mode lets you see the
    correct error.
    markstory committed Jun 24, 2012
  7. Fix whitespace error.

    markstory committed Jun 24, 2012
Commits on Jun 23, 2012
  1. Merge branch '2.1' into 2.2

    Conflicts:
    	lib/Cake/Error/exceptions.php
    markstory committed Jun 23, 2012
  2. Add tests for previous commit.

    markstory committed Jun 23, 2012
  3. Added 'helpers' to _applyConfig.

    Allows default Helpers to be modified by EmailConfig setup.
    
    Conflicts:
    
    	lib/Cake/Network/Email/CakeEmail.php
    mhamann committed with markstory Feb 22, 2012
  4. Re-add the sort option

    Even though it does nothing, it should stick around as providing
    it causes the shell to fail.
    markstory committed Jun 23, 2012
  5. Showing the list of shells grouped by plugin

    The option to sort has been removed and the list of shells is now
    sorted and grouped by plugin and then by command.
    
    Core and app shells are always listed last.
    dogmatic69 committed with markstory Jun 18, 2012
Commits on Jun 22, 2012
  1. remove unneeded line

    ceeram committed Jun 22, 2012
Commits on Jun 20, 2012
  1. Parse rules in getField()

    ceeram committed Jun 20, 2012
  2. Merge remote-tracking branch 'cakephp/2.2' into 3.0-namespace

    Conflicts:
    	lib/Cake/Controller/Component/AuthComponent.php
    	lib/Cake/Test/TestCase/Controller/ControllerTest.php
    	lib/Cake/TestSuite/Fixture/FixtureManager.php
    	lib/Cake/VERSION.txt
    committed Jun 20, 2012
Commits on Jun 19, 2012