Skip to content
Commits on Feb 1, 2014
  1. @ADmad
Commits on Jan 30, 2014
  1. @markstory

    Merge branch '2.5' into 3.0

    markstory committed Jan 30, 2014
    Conflicts:
    	build.xml
    	lib/Cake/Model/Behavior/TranslateBehavior.php
    	lib/Cake/Model/Permission.php
    	lib/Cake/Network/Http/HttpSocket.php
    	lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php
    	lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
    	lib/Cake/Test/Case/Model/models.php
    	src/Console/Command/Task/ExtractTask.php
  2. @markstory

    Merge branch 'master' into 2.5

    markstory committed Jan 30, 2014
Commits on Jan 29, 2014
  1. @walker

    Grammatical fix in API docs only

    walker committed Jan 29, 2014
    Grammatical fix in API docs only
    
    reset
  2. @markstory

    Merge pull request #2692 from jrbasso/2.5-cors

    markstory committed Jan 29, 2014
    Added support to cross origin requests
  3. @markstory

    Merge pull request #2731 from joostdekeijzer/console-extract-not-hand…

    markstory committed Jan 29, 2014
    …ling-validation-quotes
    
    Console Extract task doesn't handle validation messages with qoutes correctly
  4. @markstory

    Merge pull request #2728 from joostdekeijzer/2721-fix-in-translatebeh…

    markstory committed Jan 29, 2014
    …avior
    
    Fix Model::field() and  TranslateBehavior::beforeFind() not working together.
    
    Fixes #2721
  5. Fix Console "extract i18n from sources" to handle quotes in Model::va…

    joostdekeijzer committed Jan 29, 2014
    …lidate parameters correctly
  6. Fix #2721 in TranslateBehavior::beforeFind() supporting both Model::f…

    joostdekeijzer committed Jan 29, 2014
    …ield('fieldname') and Model::read('fieldname')
  7. correct property comment

    joostdekeijzer committed Jan 29, 2014
  8. @rchavik
Commits on Jan 26, 2014
  1. @markstory

    Update version number to 2.4.5

    markstory committed Jan 26, 2014
  2. @ADmad

    Removed unneeded file.

    ADmad committed Jan 27, 2014
  3. @ADmad

    Merge branch '2.5' into 3.0-merge

    ADmad committed Jan 26, 2014
    Conflicts:
    	build.xml
    	lib/Cake/Console/Command/SchemaShell.php
    	lib/Cake/Console/Command/UpgradeShell.php
    	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
    	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
    	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
    	lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp
    	lib/Cake/Model/Behavior/TranslateBehavior.php
    	lib/Cake/Model/Model.php
    	lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
    	lib/Cake/Test/Case/Core/CakePluginTest.php
    	lib/Cake/Test/Case/Core/ObjectTest.php
    	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
    	lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
    	lib/Cake/Test/Case/Model/Behavior/TreeBehaviorNumberTest.php
    	lib/Cake/Test/Case/Model/Behavior/TreeBehaviorUuidTest.php
    	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
    	lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
    	lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
    	lib/Cake/Test/Case/Utility/StringTest.php
    	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
    	lib/Cake/View/Helper/PaginatorHelper.php
    	src/Controller/Component/AuthComponent.php
    	src/Network/Request.php
    	src/Routing/Route/Route.php
    	src/Utility/Time.php
    	tests/TestCase/Network/RequestTest.php
    	tests/TestCase/Routing/RouterTest.php
    	tests/test_app/TestApp/Template/Layout/Email/html/default.ctp
    	tests/test_app/TestApp/Template/Layout/Email/html/japanese.ctp
    	tests/test_app/TestApp/Template/Layout/Email/html/thin.ctp
    	tests/test_app/TestApp/Template/Layout/cache_empty_sections.ctp
    	tests/test_app/TestApp/Template/Layout/default.ctp
  4. @ADmad

    Merge branch 'master' into 2.5

    ADmad committed Jan 26, 2014
  5. @GiampaoloFalqui

    Improves next() and prev() documentation

    GiampaoloFalqui committed Jan 26, 2014
    Adds the explanation for the URL available option, which is really useful when dealing with non-default CakePHP routes, now lacking from the official documentation.
  6. @markstory

    Check data with isset() before accessing it.

    markstory committed Jan 25, 2014
    Don't blindly access data that may not exist.
    
    Fixes #2712
  7. @markstory

    Remove pointless code.

    markstory committed Jan 25, 2014
    After the changes in #2709 this code just heats the earth.
Commits on Jan 24, 2014
  1. _Trailing_ and $this->keys also do not need to be urldecoded. Both _t…

    Melvin.Ross@gmail.com committed Jan 24, 2014
    …railing_ and $this->keys gets set in _writeRoute, which also makes the regex that used to create the array $route.
    
    Any keys in $route that match [_trailing_] or any values in $this->keys are put there through the exection of preg_match. The URL is decoded before being passed to preg_match, which means the values
    inside of [_trailing_]etc. have already been decoded.
  2. Fix typo that removed '$' from '$key'

    Melvin.Ross@gmail.com committed Jan 24, 2014
  3. Remove rawurldecode from the _parseArgs function in CakeRoute since u…

    Melvin.Ross@gmail.com committed Jan 24, 2014
    …rldecode is already called on the URL string in CakeRoute::parse() when creating the $route array that is passed to _parseArgs.
    
    The result of the double urldecodes is parameters with meaningful '%' signs being stripped away on accident, and the web server reporting that the requested address doesn't exist.
Commits on Jan 22, 2014
  1. @lorenzo

    Merge pull request #2694 from bar/patch-3

    lorenzo committed Jan 22, 2014
    Correctly remove routing url from query string.
  2. @markstory

    Fix trailing whitespace.

    markstory committed Jan 21, 2014
Commits on Jan 21, 2014
  1. @jrbasso

    Added option to allowed headers

    jrbasso committed Jan 21, 2014
  2. @bar

    Update tests.

    bar committed Jan 21, 2014
  3. @bar

    Correctly remove routing url from query string.

    bar committed Jan 21, 2014
    It mostly happens when in nxing setups, because of location defined like:
    
    try_files $uri $uri/ /app/webroot/index.php?$uri&$args;
  4. @jrbasso

    Fixed doc description

    jrbasso committed Jan 21, 2014
  5. @jrbasso

    Fixed CS

    jrbasso committed Jan 21, 2014
  6. @jrbasso
  7. @jrbasso

    Fixed code for PHP 5.2

    jrbasso committed Jan 21, 2014
  8. @jrbasso
Commits on Jan 19, 2014
  1. @markstory
  2. @robmcvey @markstory
Commits on Jan 16, 2014
  1. @markstory

    Fix mising connection parameter to schema objects.

    markstory committed Jan 16, 2014
    When calling create/update the created schema object should be passed
    the current connection.
    
    Fixes #2668
  2. @markstory

    Merge branch 'master' into 2.5

    markstory committed Jan 16, 2014
Something went wrong with that request. Please try again.