Commit graph

15404 commits

Author SHA1 Message Date
Ceeram
2e2ee3b096 another attempy to set correc order for expected and result in assert, definitely time for some coffee 2012-02-22 22:31:28 +01:00
Ceeram
d5cdc46661 fixed expected and result order in asserts, also added extra test 2012-02-22 22:25:24 +01:00
Ceeram
44ea3fb122 testcase for incorrect merge of post data 2012-02-22 21:53:51 +01:00
Mark Story
b7302850b5 Merge pull request #467 from tPl0ch/2.1-required-update-create
Added support for simplified required validation on 'create' or 'update'. Fixes #230.
2012-02-22 09:43:13 -08:00
José Lorenzo Rodríguez
74d837bef3 Merge pull request #512 from shama/patch-test-fixes
Fix missing class errors with ComponentCollectionTest and DbAclTest
2012-02-22 03:48:40 -08:00
ceeram
1991da8250 Merge pull request #514 from Hyra/2.1
2.1
2012-02-22 00:48:46 -08:00
Stef van den Ham
98b84ce40b Fixed typo in TestSuiteShell 2012-02-22 09:38:59 +01:00
Mark Story
e5205a8dcc Merge pull request #511 from tigrang/crumb-list-opt
Moving duplicate logic to a new method
2012-02-21 19:50:35 -08:00
Mark Story
cee8f2cebb Merge pull request #508 from shama/patch-app-build
Updates to App::build() uses
2012-02-21 19:48:21 -08:00
Mark Story
8723cf3333 Merge pull request #510 from shama/patch-containableTest2
Remove unused method and correct visibility convention with ContainableBehaviorTest
2012-02-21 19:46:09 -08:00
Mark Story
f138c73a77 Merge pull request #483 from tigrang/getCrumbList-enhancement
Added `startText` feature to HtmlHelper::getCrumbList()
2012-02-21 18:24:16 -08:00
mark_story
6684b775cd Fix failing tests. 2012-02-21 20:45:44 -05:00
Mark Story
3e79038b06 Merge pull request #505 from shama/patch-htaccess
Remove extraneous space in .htaccess
2012-02-21 17:40:58 -08:00
Mark Story
c2d753ffb4 Merge pull request #500 from shama/patch-visibility
Add missing visibility keywords
2012-02-21 17:36:36 -08:00
Mark Story
540f6669fd Merge pull request #498 from shama/patch-loadFixtures
Remove unnecessary loadFixtures() calls
2012-02-21 17:28:52 -08:00
Mark Story
d7026204d5 Merge pull request #497 from shama/patch-crossSchemaTest
Cleaning up ModelCrossSchemaHabtm test case
2012-02-21 17:27:01 -08:00
Tigran Gabrielyan
95ba5f45a5 Keeping code dry in HtmlHelper::getCrumbs/getCrumbList 2012-02-21 11:38:13 -08:00
ceeram
6eb4f39afd Merge pull request #499 from shama/patch-dbAcl-uses
Use ComponentCollection and AclComponent on DbAclTest to avoid error
2012-02-21 01:20:52 -08:00
ADmad
007ac45b26 Merge pull request #496 from shama/patch-loadSingle-docblock
Fix docblock of CakeFixtureManager::loadSingle()
2012-02-20 22:06:47 -08:00
Mark Story
fe4f0009c9 Merge pull request #495 from shama/patch-cakeplugin-loadall
Load specific test plugins rather than all to avoid conflicts
2012-02-20 20:43:41 -08:00
Mark Story
1fa0a930e4 Merge pull request #494 from shama/patch-auth-test
Fix Failing AuthComponent Test
2012-02-20 20:42:50 -08:00
mark_story
19292a012b Add git branch to phing build. 2012-02-20 21:23:29 -05:00
Jose Lorenzo Rodriguez
a9c279aab0 Update version number to 2.1.0-RC 2012-02-20 18:10:22 -04:30
Jose Lorenzo Rodriguez
715c848577 Bringing theme code up to date with 2.0, cleaning logic a bit 2012-02-20 17:21:04 -04:30
Jose Lorenzo Rodriguez
ea933fc58c Merge remote-tracking branch 'origin/2.1' into 2.1 2012-02-20 16:51:24 -04:30
Jose Lorenzo Rodriguez
6918b70ec3 REmoving usage of deprecated ThemeView 2012-02-20 16:49:16 -04:30
Jose Lorenzo Rodriguez
02fa1ae60b Fixing a few failing test cases 2012-02-20 16:17:59 -04:30
Jose Lorenzo Rodriguez
ea79ba81a4 Adding a simpler solution to the missing view files problem without altering the built paths in App 2012-02-20 15:39:03 -04:30
ADmad
db10bdb0f3 Info tweaks in build file 2012-02-21 01:21:21 +05:30
Jose Lorenzo Rodriguez
cec9d2e615 Revert "Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit."
This reverts commit 5c792aa831.
2012-02-20 15:21:03 -04:30
ADmad
7c042a637e Updating developer name in build file 2012-02-21 01:15:33 +05:30
Ceeram
ee54daef35 AclNode now throws exception instead of trigger_error 2012-02-20 15:41:57 +01:00
Mark Story
9e8152f949 Merge pull request #417 from 0x20h/php-acl
PHP config file based ACL implementation
2012-02-19 19:34:56 -08:00
José Lorenzo Rodríguez
bd5268b941 Merge pull request #493 from cdvrooman/2.1
Improved two CakeEmail error messages
2012-02-19 08:56:55 -08:00
Christopher Vrooman
585f1e2c31 Minor changes to two error messages. 2012-02-19 14:47:49 -02:00
mark_story
943d928084 Merge branch '2.0' into 2.1 2012-02-18 22:19:38 -05:00
mark_story
89df484fc5 Remove un-necessary Set::merge().
Using Set::merge() on an empty array causes issues with out of order
numeric keys. Only merge if necessary.

Fixes #2595
2012-02-18 22:18:16 -05:00
mark_story
2ddc3873c2 Update the Set::merge() documentation. 2012-02-18 16:01:07 -05:00
mark_story
20229eeb43 Merge branch '2.0' into 2.1 2012-02-18 11:22:18 -05:00
mark_story
fce70df6ff Fix failing tests.
rawurlencode() and urlencode() handle utf8 differently.
2012-02-18 11:18:03 -05:00
teddy
0ea00c5f07 urldecode $this->url before unsetting it from CakeRequest->query 2012-02-18 11:03:36 -05:00
teddy
e6905b44c3 urldecode custom route element values 2012-02-18 10:59:46 -05:00
mark_story
2f51ef00ed Add failing tests for patches from 'teddyzeenny'. 2012-02-18 10:53:47 -05:00
Kyle Robinson Young
962fe7c571 Fix missing class errors 2012-02-18 06:32:48 -08:00
Kyle Robinson Young
32e7943b00 Fix merge conflict with 62f8dea 2012-02-18 04:39:32 -08:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
Kyle Robinson Young
c4829dc3b8 Use App::RESET instead of true with App::build() 2012-02-18 04:04:54 -08:00
Kyle Robinson Young
1312cdaedf Remove extraneous space in .htaccess 2012-02-17 21:32:09 -08:00
mark_story
2097d5a968 Fix duplicate items in HABTM associations.
Apply patch from 'Kim Biesbjerg'.  Fixes issues where nested
HABTM associations would create duplicate content.

Fixes #2564
Fixes #1598
2012-02-17 21:10:14 -05:00
mark_story
89b9bb7297 Fix duplicate items in HABTM associations.
Apply patch from 'Kim Biesbjerg'.  Fixes issues where nested
HABTM associations would create duplicate content.

Fixes #2564
Fixes #1598
2012-02-17 21:09:48 -05:00