Permalink
Switch branches/tags
Nothing to show
Commits on Dec 8, 2009
  1. Merge remote branch 'cakephp/1.3' into dev

    predominant committed Dec 8, 2009
    Conflicts:
    	cake/basics.php
    	cake/console/libs/console.php
    	cake/console/templates/skel/config/acl.ini.php
    	cake/dispatcher.php
    	cake/libs/cache.php
    	cake/libs/cache/file.php
    	cake/libs/cache/xcache.php
    	cake/libs/cake_session.php
    	cake/libs/configure.php
    	cake/libs/controller/components/security.php
    	cake/libs/controller/components/session.php
    	cake/libs/model/datasources/dbo/dbo_mysql.php
    	cake/libs/model/datasources/dbo/dbo_mysqli.php
    	cake/libs/model/datasources/dbo_source.php
    	cake/libs/router.php
    	cake/libs/set.php
    	cake/libs/string.php
    	cake/libs/validation.php
    	cake/libs/view/helper.php
    	cake/libs/view/helpers/form.php
    	cake/libs/view/helpers/html.php
    	cake/libs/view/helpers/rss.php
    	cake/libs/view/helpers/text.php
    	cake/libs/view/helpers/time.php
    	cake/libs/view/media.php
    	cake/libs/view/theme.php
    	cake/libs/view/view.php
    	cake/libs/xml.php
    	cake/tests/cases/dispatcher.test.php
    	cake/tests/cases/libs/cache/file.test.php
    	cake/tests/cases/libs/cache/memcache.test.php
    	cake/tests/cases/libs/controller/components/session.test.php
    	cake/tests/cases/libs/router.test.php
    	cake/tests/cases/libs/set.test.php
    	cake/tests/cases/libs/view/helpers/form.test.php
    	cake/tests/test_app/config/acl.ini.php
Commits on Dec 7, 2009
  1. Merge branch 'mergers' into 1.2-merger

    markstory committed Dec 7, 2009
    Conflicts:
    	cake/libs/view/helpers/text.php
    	cake/tests/cases/libs/view/helpers/text.test.php
  2. Fixing issues in tests caused by overwritten columns.

    markstory committed Dec 7, 2009
    Fixing issue where mysqli had errors using getCharsetName, moving DboMysqlBase::getCharset down to DboMysql.
  3. Merge branch '1.2' into 1.2-merger

    markstory committed Dec 7, 2009
    Conflicts:
    	cake/libs/model/datasources/dbo/dbo_mysql.php
    	cake/libs/model/datasources/dbo/dbo_mysqli.php
    	cake/libs/view/helpers/text.php
    	cake/libs/view/theme.php
Commits on Dec 4, 2009
  1. Removing unused property.

    markstory committed Dec 4, 2009
  2. Renaming parameters.

    markstory committed Dec 4, 2009
Commits on Dec 3, 2009
  1. removing reference to unused variable __bare

    AD7six committed Dec 3, 2009
  2. Changing how helpers are extracted, fixes issues with view variables …

    markstory committed Dec 3, 2009
    …not overwriting local helper variables. Fixes #381
  3. Adding passthrough to localized Validation class for Validation::ssn.…

    markstory committed Dec 3, 2009
    … Tests added. Fixes #378
Commits on Dec 2, 2009
  1. Making the various SecurityComponent::requireXX methods accept a sing…

    markstory committed Dec 2, 2009
    …le array or a list of strings as their arguments. Unifies the use of these functions with AuthComponent. Fixes #354
  2. Removing whitespace.

    markstory committed Dec 2, 2009
  3. Refactored test case.

    Phally committed with markstory Nov 4, 2009
    Signed-off-by: Mark Story <mark@mark-story.com>
  4. Added support for numeric values in expectation of assertTags().

    Phally committed with markstory Oct 28, 2009
    Signed-off-by: Mark Story <mark@mark-story.com>
  5. Restoring ACL tests.

    predominant committed Dec 2, 2009
  6. Removing code.

    markstory committed Dec 2, 2009
Commits on Dec 1, 2009
  1. Adding test for previously broken reverse routing feature, where para…

    markstory committed Dec 1, 2009
    …meters that only partially passed the pattern would be accepted.