Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cakephp/cakephp
...
head fork: cakephp/cakephp
Commits on Mar 27, 2010
@predominant predominant Removed unnecessary override of Session::id() in SessionHelper. f846005
Commits on Mar 28, 2010
@predominant predominant Removing return statements from File::__construct. 5f3f662
@markstory markstory Fixing AclNode::node() so that node expressions that could match deep…
…er elements are contained to their parent elements. Test added.
39a4566
@predominant predominant Merge remote branch 'origin/1.2' into 1.2 df544f2
@markstory markstory Fixing failing tests in SessionHelper caused by changes in CakeSessio…
…n. Removing SessionHelper::id() as all it did was call the parent method.
95c1ab3
@predominant predominant Moniro update to file construction. 289a4e9
Commits on Mar 30, 2010
@lorenzo lorenzo Using Inflector::slug in Object::_persist() to avoid parse errors o m…
…alformed variable names, closes #365
f56e24c
Commits on Mar 31, 2010
@predominant predominant Restored ability to link PHP files for CSS and JS from view helpers. 7e277e8
Commits on Apr 02, 2010
@markstory markstory Fixing Form::dateTime() for GET forms. Tests added. Fixes #522 46c4cab
Commits on Apr 06, 2010
@markstory markstory Fixing discrepancy between how belongsTo and hasOne assocations are t…
…reated in relation to their fields being added into the queryData. hasOne and belongsTo associations now behave the same. Fixes #379
629740d
Commits on Apr 10, 2010
@markstory markstory Adding tests from 'tfs' fixes inconsistencies in extracting elements …
…with one path selector. Fixes #555
3af22ee
Commits on Apr 13, 2010
@lorenzo lorenzo Fixing schema generation for postgres. Now character varying without …
…lenght is translated to "text", to avoid sql errors. Closes #564
8103581
@mariano mariano Fixing issue where TextHelper::autoLinkUrls was failing on some expre…
…ssions
864ea3d
Commits on Apr 17, 2010
@markstory markstory Adding tests for creating cache configs of different types in sequenc…
…e. Demonstrates error explained in #596.
1fee86f
@markstory markstory Adding fix for tests in previous commit. Fixes #596 5ed5c54
Commits on Apr 20, 2010
@markstory markstory Fixing autoFields causing invalid SQL when cross database joins are b…
…eing done. Tests added. Fixes #476
a5f0197
@markstory markstory Adding test to show correct functioning of containable + field() + re…
…cursive = -1. Closes #409
6600c92
Commits on Apr 23, 2010
@markstory markstory Making tests more accurate to normal use, removing extra params and a…
…dding some tests for sortKey. Refs #614
f70f7de
@markstory markstory Fixing security vulnerabilities in the test suite runner. a62e7bd
@predominant predominant Merge remote branch 'origin/1.2' into 1.2 6d6f89b
@predominant predominant Fixing group path checking in test manager. 359a770
@predominant predominant Fix viewpath for RequestHandler testing. 1ea163f
@predominant predominant Updating version numbers to 1.2.7 8443622
@predominant predominant Updating version number to 1.2.7 d9f7b9b
Commits on Apr 25, 2010
@markstory markstory Adding tests for passed arguments with dots when parseExtensions() ha…
…s been called. Refs #620
ba19e0a
@markstory markstory Adding tests for dispatcher to show periods not being removed. Refs #620
ca32f0f
@markstory markstory Adding tests that show that Router is not chopping off periods from p…
…assed arguments. Refs #620
c87e233
Commits on Apr 28, 2010
@markstory markstory Fixing inflection of words ending in analysis. Fixes #619 4e720d6
Commits on May 04, 2010
@markstory markstory Making Sanitize::stripScripts() to remove multi-line script and style…
… blocks. Fixes #657
b079922
Commits on May 06, 2010
@predominant predominant Update default core.php to include instructions for Session names. 99253c2
@predominant predominant Fixing PHP link for Session information in core.php and removing unne…
…cessary quotation.
b8a98e2
Commits on May 09, 2010
@jrbasso jrbasso Fixing some Shell tests for Windows. 501a237
Commits on May 11, 2010
@markstory markstory Making null check explicit so falsey default values can be used. Fixes 332bbcf
Commits on May 14, 2010
@markstory markstory Adding Welsh to the supported lists of locales in l10n. Thanks to 'Da…
…nAbel' for the 'patch'. Fixes #714

Conflicts:

	cake/libs/l10n.php
3d4fb10
@markstory markstory Adding tests for welsh added in previous commit. d974e65
Commits on May 19, 2010
@thatcode thatcode When using Digest Authentication the passwords do not need to be md5 …
…hashed. Removed incorrect comment.

Fixes #733

Signed-off-by: mark_story <mark@mark-story.com>
4ebeeef
Commits on May 29, 2010
@renan renan Changing break; to continue; so it will process the next tables on th…
…e array, tests added.
40cfd5c
Commits on Jun 21, 2010
@markstory markstory Modifying Controller::validateErrors so it can accept and validate ar…
…bitrary model objects, not just those attached to the controller. Test cases updated, fixes #832
418b8e5
Commits on Jun 22, 2010
@markstory markstory Removing strtolower call that was breaking autolinks for URL shortene…
…rs. Tests added. Fixes #838
6fa4ce5
Commits on Jun 23, 2010
@jrbasso jrbasso Setting cookies in a single line. Fixes #48 637ab82
Commits on Jun 29, 2010
@markstory markstory Adding test case for #867. 08ce636
@markstory markstory Minor tweak to backported test case. 93beb2b
Commits on Jul 01, 2010
@markstory markstory Fixing issue where non-reset associations would get reset by resetAss…
…ociations if __backAssociations existed. Test cases from 'real34' added. Fixes #868
7e4c3f9
Commits on Jul 03, 2010
@markstory markstory Fixing issues where multiple reset bindModel() calls would cause inco…
…rrect associations to be restored.

Also fixing issues where multiple calls to unbindModel() would cause incorrect associations to be restored.
Tests added.
Fixes #889
8edf207
Commits on Jul 07, 2010
@markstory markstory Fixing HttpSocket losing auth credentials when multiple requests are …
…made with the same object. Fixes #893
7d7bc52
Commits on Jul 08, 2010
@markstory markstory Removing trailing whitespace. 2b8bc02
Commits on Jul 11, 2010
@markstory markstory Fixing fatal error caused by associated models using a datasource tha…
…t is not a subclass of dbo_source. Test added. Fixes #873

Conflicts:

	cake/tests/cases/libs/model/datasources/dbo_source.test.php
5c1b381
@markstory markstory Changing check in AjaxHelper::link() so lazy users don't get type err…
…ors. Fixes #902
9f94d0d
Commits on Jul 23, 2010
@jrbasso jrbasso Putting the port in header Host, following RFC 2616 item 14.23. Fixes #… 9933b1e
Commits on Jul 29, 2010
@markstory markstory Fixing failing test caused by registry pollution.
Adding a test case to prove that unqualified column names work with postgresql.  Closes #930
9ea6800
Commits on Jul 31, 2010
@markstory markstory Fixing condition missing a model name in the TreeBehavior. Fixes #961 4ca3266
Commits on Aug 01, 2010
@ADmad ADmad Fixing inaccurate return type in doc block for Model::saveField(). Cl…
…oses #978
d286f63
Commits on Aug 04, 2010
@d1rk d1rk Fixing bug in String::insert that produces unexpected results with
multiple keys that start with the same substring. Fixes #984

Signed-off-by: mark_story <mark@mark-story.com>
ea11b2a
@markstory markstory Merge branch '1.2' of github.com:cakephp/cakephp into 1.2 a59b144
Commits on Aug 05, 2010
@xbuzz xbuzz Fixed 'convertEntities' to links in RSS. Fixes #959 22b7d82
@jrbasso jrbasso Added tests to ticket #959 aee6458
Commits on Aug 11, 2010
@markstory markstory Applying patch from 'Mark Mitchell' to make cake.bat return the exit …
…code of the called cake shell. Fixes #992
f25e30d
Commits on Aug 14, 2010
@markstory markstory Applying patch from 'Mark Mitchell' to fix auto exiting of cake.bat. …
…Fixes #992
ea92924
Commits on Aug 17, 2010
@markstory markstory Fixing issue where an app that was in a directory that had the same name
as a controller would end up failing to find view cache files.
Adding test for app name in controller name failure to create cache
Fixes #1025
96e636d
Commits on Aug 22, 2010
@markstory markstory Updating version numbers to 1.2.8 6d7a92d