Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add CakeTestCase::getMockForModel convenience method #953

Closed
wants to merge 355 commits into from
Closed

Add CakeTestCase::getMockForModel convenience method #953

wants to merge 355 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 16, 2012

  1. Merge branch 'master' into 2.3

    @markstory
    markstory committed Aug 16, 2012
    Copy the full SHA
    c83e941 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #752 from dereuromark/2.3-truncate-tail 

    String::tail()
    @markstory
    markstory committed Aug 16, 2012
    Copy the full SHA
    9e96c47 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2012

  1. use html ellipsis if possible (only a single char and therefore does … 

    …not line break or mess up the strlen count for length)
    euromark committed Aug 17, 2012
    Copy the full SHA
    f201684 View commit details
    Browse the repository at this point in the history

  2. coding standards

    euromark committed Aug 17, 2012
    Copy the full SHA
    4039842 View commit details
    Browse the repository at this point in the history

  3. legacy support with test cases

    euromark committed Aug 17, 2012
    Copy the full SHA
    7969062 View commit details
    Browse the repository at this point in the history

  4. correcting test

    euromark committed Aug 17, 2012
    Copy the full SHA
    07d92ef View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2012

  1. Merge branch 'master' into 2.3

    @markstory
    markstory committed Aug 20, 2012
    Copy the full SHA
    d5333a2 View commit details
    Browse the repository at this point in the history

  2. Fix lint errors + comment content.

    @markstory
    markstory committed Aug 20, 2012
    Copy the full SHA
    62dd391 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2012

  1. Ensure callbacks are triggered when using Xml/Json view with view tem… 

    …plates.

PaginatorHelper for instance needs this to correctly set options
    @ceeram
    ceeram committed Aug 22, 2012
    Copy the full SHA
    e7dc23b View commit details
    Browse the repository at this point in the history

  2. Add onlyAllow() to CakeRequest, to check if the request method matche… 

    …s the allowed ones.

Throws exception if not matched, using the required Allow response header.
    @ceeram
    ceeram committed Aug 22, 2012
    Copy the full SHA
    d730acb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #749 from ceeram/2.3-allow 

    Add allowed() to CakeRequest, to check if the request method matches the...
    @ceeram
    ceeram committed Aug 22, 2012
    Copy the full SHA
    973670c View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2012

  1. Add BlowfishAuthenticate adapter.

    @sitedyno
    sitedyno committed Aug 23, 2012
    Copy the full SHA
    d24bbcb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #775 from sitedyno/BlowfishAuthenticate 

    Add BlowfishAuthenticate adapter.
    @markstory
    markstory committed Aug 23, 2012
    Copy the full SHA
    fe3d99c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #779 from dereuromark/2.3-ellipsis-html 

    use html ellipsis if possible
    @markstory
    markstory committed Aug 23, 2012
    Copy the full SHA
    064fef1 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2012

  1. Ensure = is removed from generated salt values.

    @markstory
    markstory committed Aug 24, 2012
    Copy the full SHA
    24b68ec View commit details
    Browse the repository at this point in the history

  2. Remove legacy test for all actions allowed (*) in startup and tidy code

    @thomseddon
    thomseddon committed Aug 24, 2012
    Copy the full SHA
    f3ba2bd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #790 from thomseddon/2.3-authcomponent 

    Remove legacy test for all actions allowed (*) in startup and tidy code
    @markstory
    markstory committed Aug 24, 2012
    Copy the full SHA
    e822191 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2012

  1. Merge branch 'master' into 2.3

    @markstory
    markstory committed Aug 25, 2012
    Copy the full SHA
    d66d37c View commit details
    Browse the repository at this point in the history

  2. Added $prefix generation in core.php for cake bake shell

    @tigrang @markstory
    tigrang authored and markstory committed Aug 25, 2012
    Copy the full SHA
    8e818c8 View commit details
    Browse the repository at this point in the history

  3. Added tests for bake shell cache prefix generation

    @tigrang @markstory
    tigrang authored and markstory committed Aug 25, 2012
    Copy the full SHA
    0441c9f View commit details
    Browse the repository at this point in the history

  4. Simplify code.

    @markstory
    markstory committed Aug 25, 2012
    Copy the full SHA
    17ba713 View commit details
    Browse the repository at this point in the history

  5. use new onlyAllow() method in baked code, to ensure 405 responses hav… 

    …e required Allow header included
    @ceeram
    ceeram committed Aug 25, 2012
    8
    Copy the full SHA
    27d83ee View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2012

  1. partial remove onlyAllow from baked code, only keep in delete to be r… 

    …fc compliant
    @ceeram
    ceeram committed Aug 26, 2012
    Copy the full SHA
    abe74ad View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2012

  1. Clarify docs.

    @markstory
    markstory committed Aug 27, 2012
    Copy the full SHA
    028795e View commit details
    Browse the repository at this point in the history

  2. Fix whitespace.

    @markstory
    markstory committed Aug 27, 2012
    Copy the full SHA
    934838f View commit details
    Browse the repository at this point in the history

  3. remove settings parameter from initialize as this is not being passed… 

    …. only the constructor gets settings passed
    @ceeram
    ceeram committed Aug 27, 2012
    Copy the full SHA
    f1ce3f9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #798 from ceeram/2.3-initialize 

    remove settings parameter from initialize as this is not being passed. o...
    @markstory
    markstory committed Aug 27, 2012
    Copy the full SHA
    d18173d View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2012

  1. Changed to accept language do not return the qualifiers and order the… 

    … values by the qualifier. Also, making the test case insensitive
    @jrbasso
    jrbasso committed Aug 29, 2012
    Copy the full SHA
    fd2f3ae View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2012

  1. Fix strict errors.

    @markstory
    markstory committed Aug 30, 2012
    Copy the full SHA
    19c2a58 View commit details
    Browse the repository at this point in the history

  2. Remove un-necessary parameter.

    @markstory
    markstory committed Aug 30, 2012
    Copy the full SHA
    6a95b57 View commit details
    Browse the repository at this point in the history

  3. added schema support for mysql bigints

    @tmacwill @markstory
    tmacwill authored and markstory committed Aug 30, 2012
    Copy the full SHA
    15555a7 View commit details
    Browse the repository at this point in the history

  4. BIGINTs can also be primary keys

    @tmacwill @markstory
    tmacwill authored and markstory committed Aug 30, 2012
    Copy the full SHA
    68116f7 View commit details
    Browse the repository at this point in the history

  5. added tests for bigints

    @tmacwill @markstory
    tmacwill authored and markstory committed Aug 30, 2012
    Copy the full SHA
    ec35e31 View commit details
    Browse the repository at this point in the history

  6. Add bigint support for postgres

    @markstory
    markstory committed Aug 30, 2012
    Copy the full SHA
    7bad865 View commit details
    Browse the repository at this point in the history

  7. Add bigint support for Sqlite. 

    * Update SQLite for biginteger.
* Update CakeSchema tests for integration purposes.
    @markstory
    markstory committed Aug 30, 2012
    Copy the full SHA
    8d8f4b5 View commit details
    Browse the repository at this point in the history

  8. Add support for biginteger on SQLserver.

    @markstory
    markstory committed Aug 30, 2012
    Copy the full SHA
    d4ee62b View commit details
    Browse the repository at this point in the history

  9. Fix big int lengths on SQLserver 

    SQLserver big ints aren't as big as other database servers.
    @markstory
    markstory committed Aug 30, 2012
    Copy the full SHA
    e64f5f1 View commit details
    Browse the repository at this point in the history

  10. Merge branch '2.3' of github.com:cakephp/cakephp into 2.3

    @markstory
    markstory committed Aug 30, 2012
    Copy the full SHA
    d92ff9c View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into 2.3

    @markstory
    markstory committed Aug 30, 2012
    Copy the full SHA
    7283007 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2012

  1. Merge branch 'master' into 2.3 

    Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
    @markstory
    markstory committed Sep 1, 2012
    Copy the full SHA
    571c8bc View commit details
    Browse the repository at this point in the history

  2. Make test a bit more solid.

    @markstory
    markstory committed Sep 1, 2012
    Copy the full SHA
    072991d View commit details
    Browse the repository at this point in the history

  3. Revert "Make test a bit more solid." 

    This reverts commit 072991d.
    @markstory
    markstory committed Sep 1, 2012
    Copy the full SHA
    21a51a3 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2012

  1. Allow postLink() to support other HTTP methods; it defaults to POST

    @brq
    brq committed Sep 2, 2012
    Copy the full SHA
    fca98e3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #811 from brq/2.3 

    Allow postLink() to support other HTTP methods; it defaults to POST
    @markstory
    markstory committed Sep 2, 2012
    Copy the full SHA
    a1edede View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2012

  1. avoid path being made absolute twice

    euromark committed Sep 3, 2012
    Copy the full SHA
    387a974 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #812 from dereuromark/2.3-mediaview 

    Remove redundant prefixing of APP to path. It's already done in CakeResponse::file()
    @ADmad
    ADmad committed Sep 3, 2012
    Copy the full SHA
    a392892 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #731 from dereuromark/2.3-fix-rss-test 

    2.3 fix rss test
    @markstory
    markstory committed Sep 3, 2012
    Copy the full SHA
    eb33929 View commit details
    Browse the repository at this point in the history

  4. check() for CookieComponent and Configure (similar to `CakeSession::c… 

    …heck()`)
    euromark committed Sep 3, 2012
    Copy the full SHA
    2170d87 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2012

  1. Fix coding standards.

    @markstory
    markstory committed Sep 4, 2012
    Copy the full SHA
    771cfde View commit details
    Browse the repository at this point in the history

  2. Hidden divs created by FormHelper can now be customized.

    @ADmad
    ADmad committed Sep 4, 2012
    Copy the full SHA
    2895186 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2012

  1. Merge branch 'master' into 2.3 

    Conflicts:
	lib/Cake/VERSION.txt
    @markstory
    markstory committed Sep 6, 2012
    Copy the full SHA
    6664acb View commit details
    Browse the repository at this point in the history

  2. make it possible to override all of basics.php

    @AD7six
    AD7six committed Sep 6, 2012
    2
    Copy the full SHA
    99b798f View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2012

  1. allow Folder to merge recursivly and add scheme option

    euromark committed Sep 10, 2012
    Copy the full SHA
    3706853 View commit details
    Browse the repository at this point in the history

  2. doc block update

    euromark committed Sep 10, 2012
    Copy the full SHA
    f7acab7 View commit details
    Browse the repository at this point in the history

  3. correct spelling

    euromark committed Sep 10, 2012
    Copy the full SHA
    2d9d400 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2012

  1. enable PluginDot for routeClass parameter

    @rchavik
    rchavik committed Sep 12, 2012
    Copy the full SHA
    0cae19a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #822 from rchavik/2.3 

    enable PluginDot for routeClass parameter
    @lorenzo
    lorenzo committed Sep 12, 2012
    Copy the full SHA
    b227ff4 View commit details
    Browse the repository at this point in the history

  3. simplify the code in the string class 

    removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
    @dogmatic69
    dogmatic69 committed Sep 12, 2012
    Copy the full SHA
    f886d87 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #824 from dogmatic69/string-simplify-code 

    simplify the code in the string class
    @markstory
    markstory committed Sep 12, 2012
    Copy the full SHA
    0d7db89 View commit details
    Browse the repository at this point in the history

  5. Simplify the code for sanitize class 

    removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
    @dogmatic69
    dogmatic69 committed Sep 12, 2012
    Copy the full SHA
    44f8f84 View commit details
    Browse the repository at this point in the history

  6. simplify the code for object collection 

    Fixed up some abreviated variables, removing extra long lines and removed
variables that were not used.
    @dogmatic69
    dogmatic69 committed Sep 12, 2012
    Copy the full SHA
    91c09d8 View commit details
    Browse the repository at this point in the history

  7. that change did make wonky uuids

    @dogmatic69
    dogmatic69 committed Sep 12, 2012
    Copy the full SHA
    b842248 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2012

  1. Merge pull request #829 from dogmatic69/string-simplify-code 

    this change did make wonky uuids
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    5ddb61b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #825 from dogmatic69/sanitize-simplify-code 

    Simplify the code for sanitize class
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    5d8ca79 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #827 from dogmatic69/simplify-object-collection 

    simplify the code for object collection
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    25b4471 View commit details
    Browse the repository at this point in the history

  4. fixing the missing space on the if

    @dogmatic69
    dogmatic69 committed Sep 13, 2012
    Copy the full SHA
    b1db2ae View commit details
    Browse the repository at this point in the history

  5. adding the timezone as it was not being used

    @dogmatic69
    dogmatic69 committed Sep 13, 2012
    Copy the full SHA
    cf36104 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #830 from dogmatic69/string-code-format 

    fixing the missing space on the if
    @ADmad
    ADmad committed Sep 13, 2012
    Copy the full SHA
    c4458a9 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #832 from dogmatic69/cake-time-unused-var 

    adding the timezone as it was not being used
    @lorenzo
    lorenzo committed Sep 13, 2012
    Copy the full SHA
    395e5ba View commit details
    Browse the repository at this point in the history

  8. Simplify the ClassRegistry by removing else, early returns

    @dogmatic69
    dogmatic69 committed Sep 13, 2012
    Copy the full SHA
    dc3995f View commit details
    Browse the repository at this point in the history

  9. added missing App::uses('Hash', 'Utility');

    euromark committed Sep 13, 2012
    Copy the full SHA
    288fb12 View commit details
    Browse the repository at this point in the history

  10. adjusting the way the regex is done so its easier to read

    @dogmatic69
    dogmatic69 committed Sep 13, 2012
    Copy the full SHA
    50333a2 View commit details
    Browse the repository at this point in the history

  11. PHP 5.4 strict error fix

    @dogmatic69
    dogmatic69 committed Sep 13, 2012
    Copy the full SHA
    173524a View commit details
    Browse the repository at this point in the history

  12. Cleaning up the paginator component by removing extra else statements… 

    … and shifting code around.
    @dogmatic69
    dogmatic69 committed Sep 13, 2012
    Copy the full SHA
    eb98fed View commit details
    Browse the repository at this point in the history

  13. cleaning up the code, removing extra variables set and un-needed else

    @dogmatic69
    dogmatic69 committed Sep 13, 2012
    Copy the full SHA
    bf18fc4 View commit details
    Browse the repository at this point in the history

  14. Simplify the cake time class 

    Removed a lot of nested ?: code and nested if/else statements broken down
with early return. Moving a few variables lower down the function calls as
there are times when they are not even needed.

Also removed setting variables that are returned on the next line.
    @dogmatic69
    dogmatic69 committed Sep 13, 2012
    Copy the full SHA
    95b895b View commit details
    Browse the repository at this point in the history

  15. Merge pull request #834 from dereuromark/2.3-missing-appuses 

    added missing App::uses('Hash', 'Utility');
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    c7da60d View commit details
    Browse the repository at this point in the history

  16. Merge pull request #836 from dogmatic69/simplify-object-collection 

    PHP 5.4 strict error fix
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    051362a View commit details
    Browse the repository at this point in the history

  17. Merge pull request #833 from dogmatic69/simplify-class-registry 

    Simplify the ClassRegistry by removing else, and adding early returns
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    0f8262e View commit details
    Browse the repository at this point in the history

  18. Merge pull request #831 from dogmatic69/sanitize-regex-cleanup 

    adjusting the way the regex is done so its easier to read
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    31ca237 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #837 from dogmatic69/paginator-component-cleanup 

    Cleaning up the paginator component by removing extra else statements and shifting code around.
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    f22d4c0 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #838 from dogmatic69/security-component-cleanup 

    cleaning up the code, removing extra variables set and un-needed else
    @markstory
    markstory committed Sep 13, 2012
    Copy the full SHA
    51e0715 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2012

  1. Merge branch 'simplify-cake-time' into 2.3 

    Conflicts:
	lib/Cake/Utility/CakeTime.php
    @markstory
    markstory committed Sep 14, 2012
    Copy the full SHA
    ec54fa5 View commit details
    Browse the repository at this point in the history

  2. Cleaning up the AuthComponent 

    Simplify if statements, return early and less variable use
    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    2c70319 View commit details
    Browse the repository at this point in the history

  3. Fix strict error in 5.4

    @markstory
    markstory committed Sep 14, 2012
    Copy the full SHA
    921c2c6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #821 from dereuromark/2.3-folder-merge 

    allow Folder to merge recursivly and add scheme option
    @markstory
    markstory committed Sep 14, 2012
    Copy the full SHA
    5081be1 View commit details
    Browse the repository at this point in the history

  5. Fix whitespace errors.

    @markstory
    markstory committed Sep 14, 2012
    Copy the full SHA
    c13ed33 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #840 from dogmatic69/cleanup-auth-component 

    Cleaning up the AuthComponent
    @markstory
    markstory committed Sep 14, 2012
    Copy the full SHA
    1fe7913 View commit details
    Browse the repository at this point in the history

  7. Adding a check to the object before use 

    For some reason that I have not been able to figure out yet the object is
returned as null.  This is causing some exceptions when trying to access
properties that dont exist.

FatalErrorException: "Call to a member function getAssociated() on a non-object"

Test still pass with the added check.
    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    6f3e6c1 View commit details
    Browse the repository at this point in the history

  8. You cant pass func_get_args() in PHP < 5.3

    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    c7faad9 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #844 from dogmatic69/form-bug 

    Adding a check to the object before use
    @markstory
    markstory committed Sep 14, 2012
    Copy the full SHA
    98992e0 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #845 from dogmatic69/security-component-cleanup 

    You cant pass func_get_args() in PHP < 5.3
    @markstory
    markstory committed Sep 14, 2012
    Copy the full SHA
    ec4333d View commit details
    Browse the repository at this point in the history

  11. Cleaning up the RequestHandlerCompoent 

    removing redundant code and shifting a few things around so there
are less nested ifs and making things easier to follow.

Removing some variable setting, returning function calls instead.
    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    e09bf02 View commit details
    Browse the repository at this point in the history

  12. converting $foo == null / $foo == false to !$foo

    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    cf8fcca View commit details
    Browse the repository at this point in the history

  13. converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)

    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    22a2e1b View commit details
    Browse the repository at this point in the history

  14. converting if($foo == true) to if($foo)

    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    5cc03ca View commit details
    Browse the repository at this point in the history

  15. strict type checks and removing some duplicate count() calls by setti… 

    …ng a variable
    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    cfadc4d View commit details
    Browse the repository at this point in the history

  16. ADmads comments

    @dogmatic69
    dogmatic69 committed Sep 14, 2012
    Copy the full SHA
    f5a8eb6 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #839 from dogmatic69/cleanup-request-handler 

    Cleaning up the RequestHandlerCompoent
    @markstory
    markstory committed Sep 14, 2012
    Copy the full SHA
    a5481f1 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2012

  1. save some memory usage (PHP < 5.4) in case of huge content and cut of… 

    …f the isset call
    euromark committed Sep 15, 2012
    Copy the full SHA
    6d3e0a2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #843 from dereuromark/2.3-ticket-3172 

    check() for CookieComponent and Configure
    @markstory
    markstory committed Sep 15, 2012
    Copy the full SHA
    89c9823 View commit details
    Browse the repository at this point in the history

  3. Fix whitespace errors.

    @markstory
    markstory committed Sep 15, 2012
    Copy the full SHA
    ccd3378 View commit details
    Browse the repository at this point in the history

  4. changing join() to implode() for consistency

    @dogmatic69
    dogmatic69 committed Sep 15, 2012
    Copy the full SHA
    a38a616 View commit details
    Browse the repository at this point in the history

  5. replacing is_integer() with is_int()

    @dogmatic69
    dogmatic69 committed Sep 15, 2012
    Copy the full SHA
    aa87791 View commit details
    Browse the repository at this point in the history

  6. changing is_writeable() to is_writable()

    @dogmatic69
    dogmatic69 committed Sep 15, 2012
    Copy the full SHA
    4899b5b View commit details
    Browse the repository at this point in the history

  7. die() to exit()

    @dogmatic69
    dogmatic69 committed Sep 15, 2012
    Copy the full SHA
    d0bb8a9 View commit details
    Browse the repository at this point in the history

  8. skipping the rijndael test if mcrypt_encrypt() is not available

    @dogmatic69
    dogmatic69 committed Sep 15, 2012
    Copy the full SHA
    2693423 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2012

  1. Merge pull request #848 from dogmatic69/removing-alias-function-calls 

    Removing alias function calls
    @markstory
    markstory committed Sep 16, 2012
    Copy the full SHA
    7f76f70 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #849 from dogmatic69/rijndael-fatal-error 

    skipping the rijndael test if mcrypt_encrypt() is not available
    @markstory
    markstory committed Sep 16, 2012
    Copy the full SHA
    cdfead0 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2012

  1. add default return value as parameter to use when size can not be det… 

    …ermined
    @ceeram
    ceeram committed Sep 17, 2012
    Copy the full SHA
    9530e68 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2012

  1. Implement resetSequence() 

    This is an optional method in DboSource that allows datasources to
resetSequence values in tables.  This is useful for datasources like
Postgres, and makes using fixtures much easier.

Fixes #3026
    @markstory
    markstory committed Sep 18, 2012
    Copy the full SHA
    55dcb9c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #850 from ceeram/2.2-filesize 

    Add CakeNumber::fromReadableSize() and Validation::filesize()
    @markstory
    markstory committed Sep 18, 2012
    Copy the full SHA
    07c5102 View commit details
    Browse the repository at this point in the history

  3. opmitisation of fromReadableSize

    @ceeram
    ceeram committed Sep 18, 2012
    Copy the full SHA
    90c32ad View commit details
    Browse the repository at this point in the history

  4. Added ability to set default view block content

    @tigrang
    tigrang committed Sep 18, 2012
    Copy the full SHA
    6d98069 View commit details
    Browse the repository at this point in the history

  5. Added test case for view block default value

    @tigrang
    tigrang committed Sep 18, 2012
    Copy the full SHA
    f1a344e View commit details
    Browse the repository at this point in the history

  6. Fixed test case

    @tigrang
    tigrang committed Sep 18, 2012
    Copy the full SHA
    d30e092 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #835 from tigrang/default-block-value 

    Added ability to set default view block content
    @lorenzo
    lorenzo committed Sep 18, 2012
    Copy the full SHA
    d999a83 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #852 from cakephp/2.3-reset-sequence 

    Implement resetSequence()

Fixes #3206
    @markstory
    markstory committed Sep 18, 2012
    Copy the full SHA
    144761c View commit details
    Browse the repository at this point in the history

  9. allow for lowercase as well, also strip the unit part off before pow()

    @ceeram
    ceeram committed Sep 18, 2012
    Copy the full SHA
    ff676b5 View commit details
    Browse the repository at this point in the history

  10. adding query() for CakeRequest

    euromark committed Sep 18, 2012
    Copy the full SHA
    e8cfac0 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #856 from ceeram/2.3-cakenumber 

    Simplify and improve fromReadableSize().
    @markstory
    markstory committed Sep 18, 2012
    Copy the full SHA
    5d4a6fd View commit details
    Browse the repository at this point in the history

  12. Implement missing bits for automatic sequence resetting. 

    Refs #3206
    @markstory
    markstory committed Sep 18, 2012
    Copy the full SHA
    a1838a0 View commit details
    Browse the repository at this point in the history

  13. Fix coding standards.

    @markstory
    markstory committed Sep 18, 2012
    Copy the full SHA
    99cbd22 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2012

  1. test the query() method with arrays passed via $_GET

    euromark committed Sep 19, 2012
    Copy the full SHA
    60385d1 View commit details
    Browse the repository at this point in the history

  2. adding CakeNumber::formatDelta() and fixing issue with near-zero valu… 

    …es and format()
    euromark committed Sep 19, 2012
    Copy the full SHA
    3fa6b96 View commit details
    Browse the repository at this point in the history

  3. doc block

    euromark committed Sep 19, 2012
    Copy the full SHA
    8a070ca View commit details
    Browse the repository at this point in the history

  4. coding standards

    euromark committed Sep 19, 2012
    Copy the full SHA
    213d4ca View commit details
    Browse the repository at this point in the history

  5. adding basic test

    euromark committed Sep 19, 2012
    Copy the full SHA
    0be1943 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2012

  1. Merge pull request #858 from dereuromark/2.3-request 

    adding query() for CakeRequest
    @markstory
    markstory committed Sep 20, 2012
    Copy the full SHA
    e931211 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2012

  1. Add MySQL FULLTEXT support. 

    Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext

Fixes #262
    @bar @markstory
    bar authored and markstory committed Sep 21, 2012
    Copy the full SHA
    aaefbf1 View commit details
    Browse the repository at this point in the history

  2. Attempt to make tests pass when OpenSSL is not enabled.

    @markstory
    markstory committed Sep 21, 2012
    Copy the full SHA
    268e589 View commit details
    Browse the repository at this point in the history

  3. adding a plugin propery to models wwith tests for ticket #85 

    Merge pull request #696
    @dogmatic69 @markstory
    dogmatic69 authored and markstory committed Sep 21, 2012
    Copy the full SHA
    6d4f4b5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #859 from dereuromark/2.3-format-delta 

    adding CakeNumber::formatDelta() and fixing issue with format()
    @lorenzo
    lorenzo committed Sep 21, 2012
    Copy the full SHA
    2818ec6 View commit details
    Browse the repository at this point in the history

  5. converting if ($foo != null) to if ($foo)

    @dogmatic69
    dogmatic69 committed Sep 21, 2012
    Copy the full SHA
    b1f26b5 View commit details
    Browse the repository at this point in the history

  6. converting if ($foo != false) to if ($foo)

    @dogmatic69
    dogmatic69 committed Sep 21, 2012
    Copy the full SHA
    8dc4de5 View commit details
    Browse the repository at this point in the history

  7. converting if ($foo != "") to if ($foo)

    @dogmatic69
    dogmatic69 committed Sep 21, 2012
    Copy the full SHA
    36314e6 View commit details
    Browse the repository at this point in the history

  8. fixing error pointed out by dereuromark with recursive #846 (comment)

    @dogmatic69
    dogmatic69 committed Sep 21, 2012
    Copy the full SHA
    cd99b7d View commit details
    Browse the repository at this point in the history

  9. undo the change to avoid change in behavior

    @dogmatic69
    dogmatic69 committed Sep 21, 2012
    Copy the full SHA
    1b36853 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2012

  1. refactoring asset dispatcher filter

    @ceeram
    ceeram committed Sep 24, 2012
    Copy the full SHA
    3665a95 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #867 from ceeram/2.3-assetfilter 

    refactoring asset dispatcher filter
    @lorenzo
    lorenzo committed Sep 24, 2012
    Copy the full SHA
    a355a84 View commit details
    Browse the repository at this point in the history

  3. avoid pass by reference error on 5.4

    @ceeram
    ceeram committed Sep 24, 2012
    Copy the full SHA
    e454282 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2012

  1. Merge remote-tracking branch 'origin/master' into 2.3 

    Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
    @lorenzo
    lorenzo committed Sep 25, 2012
    Copy the full SHA
    d5c9d97 View commit details
    Browse the repository at this point in the history

  2. Removing variable from dump test as it does not exist anymore

    @lorenzo
    lorenzo committed Sep 25, 2012
    Copy the full SHA
    047ffd1 View commit details
    Browse the repository at this point in the history

  3. Fixed typo

    @lorenzo
    lorenzo committed Sep 25, 2012
    Copy the full SHA
    c870044 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2012

  1. Attempting to get passing builds on travisci 

    Currently the 5.2 builds fail due to the length checks on blowfish
hashes.  Try a shorter wall to see if those builds will pass.
    @markstory
    markstory committed Sep 27, 2012
    Copy the full SHA
    61d6f71 View commit details
    Browse the repository at this point in the history

  2. Revert "Attempting to get passing builds on travisci" 

    This reverts commit 61d6f71.
    @markstory
    markstory committed Sep 27, 2012
    Copy the full SHA
    8bbb1f1 View commit details
    Browse the repository at this point in the history

  3. Try skipping blowfish tests if hashes are wrong. 

    Another attempt at fixing failing tests on travisci.
    @markstory
    markstory committed Sep 27, 2012
    Copy the full SHA
    ea784f6 View commit details
    Browse the repository at this point in the history

  4. Try to fix another test failure caused by blowfish. 

    travis ci seems to have wonky hashing with blowfish on the 5.2 boxes.
Skip tests when we know blowfish is messed up.
    @markstory
    markstory committed Sep 27, 2012
    Copy the full SHA
    76d21c6 View commit details
    Browse the repository at this point in the history

  5. correcting iso standard for nld (dutch) - making dut the alias

    euromark committed Sep 27, 2012
    Copy the full SHA
    c87b53a View commit details
    Browse the repository at this point in the history

  6. move charset/App.encoding into CakeResponse

    euromark committed Sep 27, 2012
    Copy the full SHA
    b47e3a7 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2012

  1. Merge pull request #869 from dereuromark/2.3-nld 

    Correcting iso standard for nld (dutch) - making dut the alias

Fixes #795
    @markstory
    markstory committed Sep 28, 2012
    Copy the full SHA
    f55160e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #871 from dereuromark/2.3-dispatch 

    move charset/App.encoding into CakeResponse
    @markstory
    markstory committed Sep 28, 2012
    Copy the full SHA
    9c78aae View commit details
    Browse the repository at this point in the history

  3. Fix whitespace.

    @markstory
    markstory committed Sep 28, 2012
    Copy the full SHA
    eed59a9 View commit details
    Browse the repository at this point in the history

  4. Fix coding standard error.

    @markstory
    markstory committed Sep 28, 2012
    Copy the full SHA
    e550332 View commit details
    Browse the repository at this point in the history

  5. correcting coding-standards

    euromark committed Sep 28, 2012
    Copy the full SHA
    b7f1740 View commit details
    Browse the repository at this point in the history

  6. after correcting nld the iso standard should be enforced for all lang… 

    …uages
    euromark committed Sep 28, 2012
    Copy the full SHA
    0327043 View commit details
    Browse the repository at this point in the history

  7. doc block correction

    euromark committed Sep 28, 2012
    Copy the full SHA
    a33b187 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2012

  1. Merge pull request #873 from dereuromark/coding-standards 

    correcting coding-standards
    @markstory
    markstory committed Sep 29, 2012
    Copy the full SHA
    87fc861 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #874 from dereuromark/2.3-languages 

    after correcting nld the iso standard should be enforced for all langs
    @markstory
    markstory committed Sep 29, 2012
    Copy the full SHA
    51245ce View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 2.3

    @markstory
    markstory committed Sep 29, 2012
    Copy the full SHA
    59e948f View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2012

  1. Replace Model::read() with Model::find('first') in baked controller 

    Removed references to Ajax and Javascript helpers
    @ADmad
    ADmad committed Sep 30, 2012
    Copy the full SHA
    035f727 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #878 from ADmad/2.3-bake-template 

    Replace Model::read() with Model::find('first') in baked controller
    @markstory
    markstory committed Sep 30, 2012
    Copy the full SHA
    e1a0ce7 View commit details
    Browse the repository at this point in the history

  3. fixing a error in the tests

    @dogmatic69
    dogmatic69 committed Sep 30, 2012
    Copy the full SHA
    095e8df View commit details
    Browse the repository at this point in the history

  4. Merge pull request #882 from dogmatic69/test-error 

    fixing a error in the tests
    @markstory
    markstory committed Sep 30, 2012
    Copy the full SHA
    9ed901b View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2012

  1. Merge branch '2.3' into type-checks 

    Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
    @dogmatic69
    dogmatic69 committed Oct 1, 2012
    Copy the full SHA
    408e619 View commit details
    Browse the repository at this point in the history

  2. formatting changes..

    Andras Kende committed Oct 1, 2012
    Copy the full SHA
    f5be83d View commit details
    Browse the repository at this point in the history

  3. removed 2 empty lines

    Andras Kende committed Oct 1, 2012
    Copy the full SHA
    fa5d2c1 View commit details
    Browse the repository at this point in the history

  4. making messages() and errors() reset themselves by default

    euromark committed Oct 1, 2012
    Copy the full SHA
    7383298 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #866 from dereuromark/2.3-folder-reset 

    making messages() and errors() reset themselves by default
    @ADmad
    ADmad committed Oct 1, 2012
    Copy the full SHA
    8efc641 View commit details
    Browse the repository at this point in the history

  6. Fix failing tests

    @ADmad
    ADmad committed Oct 1, 2012
    2
    Copy the full SHA
    ce9ad1f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #883 from andraskende/2.3 

    formatting changes..
    @markstory
    markstory committed Oct 1, 2012
    Copy the full SHA
    127b906 View commit details
    Browse the repository at this point in the history

  8. Allow content to be added before existing content in view block.

    @ADmad
    ADmad committed Oct 1, 2012
    Copy the full SHA
    47708c5 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2012

  1. Merge branch 'master' into 2.3 

    Conflicts:
	lib/Cake/View/View.php
    @markstory
    markstory committed Oct 2, 2012
    Copy the full SHA
    a3ae58d View commit details
    Browse the repository at this point in the history

  2. Fix trailing whitespace.

    @markstory
    markstory committed Oct 2, 2012
    Copy the full SHA
    e58c93c View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2012

  1. Reduce some code complexity.

    @markstory
    markstory committed Oct 4, 2012
    2
    Copy the full SHA
    feda6e0 View commit details
    Browse the repository at this point in the history

  2. Allow throwing exception instead of redirecting upon unauthorized acc… 

    …ess attempt. Closes #591
    @ADmad
    ADmad committed Oct 4, 2012
    Copy the full SHA
    1c0492e View commit details
    Browse the repository at this point in the history

  3. Fix variable naming.

    @markstory
    markstory committed Oct 4, 2012
    Copy the full SHA
    57f81da View commit details
    Browse the repository at this point in the history

  4. Load routes as late as possible. 

    As a concequence - routes will also work by default in the cli
    @AD7six
    AD7six committed Oct 4, 2012
    Copy the full SHA
    5140baf View commit details
    Browse the repository at this point in the history

  5. unbrake Console/cake on osx

    @AD7six
    AD7six committed Oct 4, 2012
    Copy the full SHA
    52f2060 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2012

  1. url encode nested named parameters in unmatched routes 

    reference: #2988
and 3103323
    @AD7six
    AD7six committed Oct 5, 2012
    Copy the full SHA
    fa6defe View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2012

  1. Cache character set names

    @ADmad
    ADmad committed Oct 7, 2012
    Copy the full SHA
    a1aa73c View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2012

  1. Merge branch 'master' into 2.3

    @markstory
    markstory committed Oct 8, 2012
    Copy the full SHA
    9a66768 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2012

  1. Fix code style errors.

    @markstory
    markstory committed Oct 9, 2012
    Copy the full SHA
    57681ff View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2012

  1. default value null makes more sense. add test cases for false.

    euromark committed Oct 12, 2012
    Copy the full SHA
    7bf08fd View commit details
    Browse the repository at this point in the history

  2. remove default value for debug's first argument

    euromark committed Oct 12, 2012
    Copy the full SHA
    17be6d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2012

  1. Allow specifying tag for current page number. Closes #2892

    @ADmad
    ADmad committed Oct 13, 2012
    Copy the full SHA
    61dd109 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2012

  1. Merge pull request #899 from dereuromark/2.3-more-tests 

    default value null makes more sense. add test cases for false.
    @markstory
    markstory committed Oct 14, 2012
    Copy the full SHA
    7ea3ee4 View commit details
    Browse the repository at this point in the history

  2. Fix incomplete patch 61dd109

    @ADmad
    ADmad committed Oct 14, 2012
    Copy the full SHA
    56a0eb0 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2012

  1. Removed spaces at the end of lines.

    @predominant
    predominant committed Oct 15, 2012
    Copy the full SHA
    41ae19b View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2012

  1. Merge branch 'master' into 2.3 

    Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
    @markstory
    markstory committed Oct 16, 2012
    Copy the full SHA
    1aea9ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 2.3

    @markstory
    markstory committed Oct 16, 2012
    Copy the full SHA
    1cc82ff View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2012

  1. allow ini files to have separators between sections for better readab… 

    …ility

dump now makes spaces between sections in init files
    euromark committed Oct 18, 2012
    Copy the full SHA
    5a8092f View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2012

  1. Force field validation to use sha1 

    When using blowfish as your application's hashing strategy, form field
validation would fail horribly.  Forcing sha1 fixes this and restores
behavior consistent with 2.2.x

Fixes #3280
    @markstory
    markstory committed Oct 19, 2012
    Copy the full SHA
    f457f07 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2012

  1. Merge branch 'master' into 2.3 

    Conflicts:
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
    @markstory
    markstory committed Oct 21, 2012
    Copy the full SHA
    0b0b361 View commit details
    Browse the repository at this point in the history

  2. Remove bad test.

    @markstory
    markstory committed Oct 21, 2012
    Copy the full SHA
    d4631a6 View commit details
    Browse the repository at this point in the history

  3. Fixed problems with resetSequence() not using the correct sequence name 

    in postgres
    @lorenzo
    lorenzo committed Oct 21, 2012
    Copy the full SHA
    c00d58b View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2012

  1. use the right language domain 

    these messages are for developers, not end users
    @AD7six
    AD7six committed Oct 22, 2012
    Copy the full SHA
    35686c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2012

  1. Merge pull request #905 from dereuromark/2.3-ini 

    allow ini files to have separators between sections for better readability
    @markstory
    markstory committed Oct 23, 2012
    Copy the full SHA
    d75bd48 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 2.3 

    Conflicts:
	lib/Cake/bootstrap.php
    @ADmad
    ADmad committed Oct 23, 2012
    Copy the full SHA
    1763f46 View commit details
    Browse the repository at this point in the history

  3. Moving the mb_* functions to bootstrap.php

    @ADmad
    ADmad committed Oct 23, 2012
    Copy the full SHA
    3ee267d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2012

  1. Merge branch 'master' into 2.3

    @markstory
    markstory committed Oct 24, 2012
    Copy the full SHA
    d201030 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2.3' into type-checks 

    Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
    @dogmatic69
    dogmatic69 committed Oct 24, 2012
    Copy the full SHA
    641ba9f View commit details
    Browse the repository at this point in the history

  3. afterRender should not be triggered when callbacks is false

    @ceeram
    ceeram committed Oct 24, 2012
    Copy the full SHA
    6fc019e View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2012

  1. Merge pull request #911 from dogmatic69/type-checks 

    Type checks
    @markstory
    markstory committed Oct 25, 2012
    Copy the full SHA
    2841611 View commit details
    Browse the repository at this point in the history

  2. Fix failing tests.

    @markstory
    markstory committed Oct 25, 2012
    Copy the full SHA
    c4b9fa6 View commit details
    Browse the repository at this point in the history

  3. Fix lint error.

    @markstory
    markstory committed Oct 25, 2012
    Copy the full SHA
    5786245 View commit details
    Browse the repository at this point in the history

  4. Add some fixed orders. 

    Hopefully this makes tests in postgres more reliable.
    @markstory
    markstory committed Oct 25, 2012
    Copy the full SHA
    9e07789 View commit details
    Browse the repository at this point in the history

  5. Try to set order on more things.

    @markstory
    markstory committed Oct 25, 2012
    Copy the full SHA
    83d307e View commit details
    Browse the repository at this point in the history

  6. solves ticket 3306

    euromark committed Oct 25, 2012
    Copy the full SHA
    f3bbe89 View commit details
    Browse the repository at this point in the history

  7. making tests pass on windows again

    euromark committed Oct 25, 2012
    Copy the full SHA
    cc43614 View commit details
    Browse the repository at this point in the history

  8. Make app/Console/cake pwd insensitive on Mac OS X. 

    Follow up of [36e15a0].
    @renan
    renan committed Oct 25, 2012
    Copy the full SHA
    02cface View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2012

  1. Merge pull request #914 from dereuromark/2.3-i18n-extract 

    Normalize paths in generate pot files to always use /

Fixes #3306
    @markstory
    markstory committed Oct 26, 2012
    Copy the full SHA
    d051b69 View commit details
    Browse the repository at this point in the history

  2. CakeSchema: adds empty line between tables

    @rchavik
    rchavik committed Oct 26, 2012
    Copy the full SHA
    e614831 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #919 from rchavik/2.3 

    CakeSchema: adds empty line between tables
    @markstory
    markstory committed Oct 26, 2012
    Copy the full SHA
    ab11d50 View commit details
    Browse the repository at this point in the history

  4. Squashed commit of the following: 

    commit 22311a1
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Oct 26 14:40:24 2012 +0200

    Merge branch '2.3' into currency

commit fda331e
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 23:53:03 2012 +0200

    NumberHelper now also uses the default currency from CakeNumber, instead of default argument value

commit 967bf8e
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 18:01:35 2012 +0200

    Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
    @ceeram
    ceeram committed Oct 26, 2012
    Copy the full SHA
    f4f4aa4 View commit details
    Browse the repository at this point in the history

  5. cleanup

    euromark committed Oct 26, 2012
    Copy the full SHA
    5324a8c View commit details
    Browse the repository at this point in the history

  6. coding standards regarding whitespaces

    euromark committed Oct 26, 2012
    Copy the full SHA
    0f97819 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2012

  1. Merge pull request #923 from dereuromark/2.3-fixes 

    2.3 fixes
    @markstory
    markstory committed Oct 27, 2012
    Copy the full SHA
    31a5401 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2012

  1. Merge branch 'master' into 2.3 

    Conflicts:
	lib/Cake/View/Helper/FormHelper.php
    @markstory
    markstory committed Oct 28, 2012
    Copy the full SHA
    c24bec6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 2.3

    @markstory
    markstory committed Oct 28, 2012
    Copy the full SHA
    c794e29 View commit details
    Browse the repository at this point in the history

  3. Fixing failing test case in RssHelper

    @lorenzo
    lorenzo committed Oct 28, 2012
    2
    Copy the full SHA
    7715689 View commit details
    Browse the repository at this point in the history

  4. Avoiding problems with relative paths in shell dispatcher

    @lorenzo
    lorenzo committed Oct 28, 2012
    Copy the full SHA
    8538c0e View commit details
    Browse the repository at this point in the history

  5. Revert "Fixing failing test case in RssHelper" 

    This reverts commit 7715689.
    @lorenzo
    lorenzo committed Oct 28, 2012
    Copy the full SHA
    8bca041 View commit details
    Browse the repository at this point in the history

  6. Fix coding standard.

    @markstory
    markstory committed Oct 28, 2012
    Copy the full SHA
    f8d602c View commit details
    Browse the repository at this point in the history

  7. Fix coding standard error

    @ADmad
    ADmad committed Oct 28, 2012
    Copy the full SHA
    1e50ead View commit details
    Browse the repository at this point in the history

  8. Update version number to 2.3.0-beta

    @lorenzo
    lorenzo committed Oct 28, 2012
    Copy the full SHA
    b75bb8e View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2012

  1. Merge branch 'master' into 2.3

    @markstory
    markstory committed Oct 29, 2012
    Copy the full SHA
    478461d View commit details
    Browse the repository at this point in the history

  2. Code standards fixes

    @shama
    shama committed Oct 29, 2012
    Copy the full SHA
    f10c669 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #928 from shama/patch-cs 

    Code standards fixes
    @lorenzo
    lorenzo committed Oct 29, 2012
    Copy the full SHA
    2ab3a46 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2012

  1. code optimizing and simplify _crypt(), see PR #853

    @ceeram
    ceeram committed Nov 1, 2012
    Copy the full SHA
    0196c6f View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2012

  1. RedisEngine: authenticate connection if 'password' is set

    @rchavik
    rchavik committed Nov 2, 2012
    Copy the full SHA
    7d84486 View commit details
    Browse the repository at this point in the history

  2. fix fieldlist, refs PR808 and PR851 

    Squashed commit of the following:

commit 7007dba
Merge: 3ca4d23 7d84486
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 10:53:39 2012 +0100

    Merge branch '2.3' into calinseciu-2.3

commit 3ca4d23
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Sep 23 12:45:00 2012 +0200

    more tests added

commit e6b1253
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Sep 18 09:18:32 2012 +0200

    change methodname and visbilty

commit 7039626
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 17:26:52 2012 +0200

    fix fieldlist, refs PR #808

commit e9db96b
Merge: 99b798f adb8142
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 16:26:40 2012 +0200

    Merge branch '2.3' of git://github.com/calinseciu/cakephp into calinseciu-2.3

commit adb8142
Author: calinseciu <calinseciu@gmail.com>
Date:   Thu Aug 30 17:57:50 2012 +0300

    Add foreignKey to whitelist in saveAssociated()

    Association's foreignKey doesn't get saved when saving hasMany associations since it's not in the model's whitelist after validation.
    This happens if you don't send the foreignKey with the associated records data.
    @ceeram
    ceeram committed Nov 2, 2012
    Copy the full SHA
    b8607ca View commit details
    Browse the repository at this point in the history

  3. fix incorrect tests

    @ceeram
    ceeram committed Nov 2, 2012
    Copy the full SHA
    b18550c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 2.3 

    Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
    @markstory
    markstory committed Nov 2, 2012
    Copy the full SHA
    60f9626 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2012

  1. Adding warning to home.ctp when DebugKit is not installed 

    Adding a list of official plugins to home.ctp
Removing old link to live.cakephp.org and replacing it with
plugins.cakephp.org
    @lorenzo
    lorenzo committed Nov 3, 2012
    Copy the full SHA
    6c1bed3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #938 from lorenzo/2.3-new-home 

    Helping newcomers find useful plugins
    @predominant
    predominant committed Nov 3, 2012
    Copy the full SHA
    ac61bd4 View commit details
    Browse the repository at this point in the history

  3. Remove duplicate App::uses() statement

    @ADmad
    ADmad committed Nov 3, 2012
    Copy the full SHA
    570acfa View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2012

  1. XmlView: configure top level element name 

    Allow the top level element name to be configured by setting
XmlView.RootNodeName.
    @larryb82 @markstory
    larryb82 authored and markstory committed Nov 5, 2012
    Copy the full SHA
    a60a730 View commit details
    Browse the repository at this point in the history

  2. Fix whitespace.

    @markstory
    markstory committed Nov 5, 2012
    Copy the full SHA
    f53153b View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2012

  1. Update docs for the escape option in CakeNumber::currency() 

    Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.

Closes #3351
    @markstory
    markstory committed Nov 9, 2012
    Copy the full SHA
    fe4f9f2 View commit details
    Browse the repository at this point in the history

  2. Use bytcode sequence for unicode ellipsis 

    The codepoint for "horizontal ellipsis" is 0x2026, which enables a more
robust display of that character on different systems.
    Alexander Hofbauer committed Nov 9, 2012
    Copy the full SHA
    c7fda56 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #945 from aleho/2.3 

    Use bytcode sequence for unicode ellipsis

Fixes #3356
    @markstory
    markstory committed Nov 9, 2012
    Copy the full SHA
    7e00be8 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2012

  1. Fix failing tests using chr(226) instead of unicode codes.

    @markstory
    markstory committed Nov 10, 2012
    Copy the full SHA
    8b7b139 View commit details
    Browse the repository at this point in the history

  2. Call a few fewer methods.

    @markstory
    markstory committed Nov 10, 2012
    Copy the full SHA
    6378aab View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2012

  1. Merge branch 'master' into 2.3 

    Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
    @markstory
    markstory committed Nov 11, 2012
    Copy the full SHA
    e0aab77 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2012

  1. Improve Blowfish Docblocks

    @sitedyno
    sitedyno committed Nov 12, 2012
    Copy the full SHA
    895fcac View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2012

  1. Add CakeTestCase::getMockForModel convenience method 

    This method provides a convenience to create mocked models that
are still associated with fixtures and the datasource.
    @rhelms
    rhelms committed Nov 13, 2012
    Copy the full SHA
    1672cff View commit details
    Browse the repository at this point in the history

  2. Merge pull request #948 from sitedyno/blowfish-updates 

    Blowfish Clarifications.
    @markstory
    markstory committed Nov 13, 2012
    Copy the full SHA
    eb3e509 View commit details
    Browse the repository at this point in the history

  3. Remove off by a second errors.

    @markstory
    markstory committed Nov 13, 2012
    Copy the full SHA
    9ef9b8b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/2.3' into feature/mock-model

    @rhelms
    rhelms committed Nov 13, 2012
    Copy the full SHA
    646f278 View commit details
    Browse the repository at this point in the history