Permalink
Commits on Jan 23, 2012
Commits on Jan 22, 2012
  1. Merge pull request #438 from predominant/2.1

    Prefix for cache configuration
    predominant committed Jan 22, 2012
  2. Avoiding class name conflicts

    lorenzo committed Jan 22, 2012
  3. Merge pull request #437 from josegonzalez/2.1-theme-view

    2.1 theme view
    lorenzo committed Jan 22, 2012
  4. Merging ThemeView and View class

    In 2.1, the ThemeView is merely a small wrapper around View with extra paths set. Merging these two classes means there is one less property for developers to set to enable themes in their applications.
    josegonzalez committed Jan 22, 2012
  5. Set encoding in CSS file.

    Signed-off-by: mark_story <mark@mark-story.com>
    yandod committed with markstory Jan 22, 2012
Commits on Jan 21, 2012
  1. Merge branch '2.1-http' into 2.1

    lorenzo committed Jan 21, 2012
  2. Add note about PHP's include_path.

    Refs #2497
    markstory committed Jan 21, 2012
  3. Merge branch '2.0' into 2.1

    Conflicts:
    	lib/Cake/Model/Model.php
    	lib/Cake/Test/Case/Routing/RouterTest.php
    markstory committed Jan 21, 2012
  4. Merge changes from hmic/CakeEmail-2.0

    Adds parameters for file attachments instead of having
    boundary prefixes in multiple places.
    
    Fixes #GH433
    markstory committed Jan 21, 2012
Commits on Jan 20, 2012
  1. Merge changes from 1.3 to 2.0

    Merge changes from #GH284 from 1.3 to 2.0.
    Model::validate() no longer does queries when its not
    necessary.
    markstory committed Jan 20, 2012
  2. added sftp to url()

    mattpotts committed with markstory Nov 23, 2011
  3. Readability changes

    lorenzo committed Jan 20, 2012
  4. Adding test for #GH424

    markstory committed Jan 20, 2012
  5. Reformat long line.

    markstory committed Jan 20, 2012
  6. Merge pull request #424 from stefanozoffoli/patch-2

    Prevent blackhole auth error where are present multi fields
    markstory committed Jan 20, 2012
  7. Test case and Fix for: Number::currency() issue

    Fixes currency() for custom formats and numbers between -1 and 1.
    
    Fixes #2489
    
    Conflicts:
    
    	lib/Cake/Test/Case/View/Helper/NumberHelperTest.php
    	lib/Cake/View/Helper/NumberHelper.php
    wnasich committed with markstory Jan 19, 2012
Commits on Jan 19, 2012
  1. Removed constant available only in php 5.3 and changed exception type…

    … to fix errors on php 5.2. Fixes #2487
    ADmad committed Jan 19, 2012
  2. Removed constant available only in php 5.3 and changed exception type…

    … to fix errors on php 5.2. Fixes #2487
    ADmad committed Jan 19, 2012
  3. Merge branch 'feature/set-nest' into 2.1

    Conflicts:
    	lib/Cake/Model/Model.php
    AD7six committed Jan 19, 2012
  4. Fixing some failing test cases

    lorenzo committed Jan 19, 2012
  5. Fixing a couple bugs in CakeResponse::checkNotModified() and implemen…

    …ting conditional rendering in
    
    RequestHandlerComponent
    lorenzo committed Jan 19, 2012