Commit graph

12804 commits

Author SHA1 Message Date
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
Mark Story
60df31cfb6 Merge pull request #487 from dogmatic69/2.1
2.1
2012-02-17 17:38:03 -08:00
Mark Story
9762824ce3 Merge pull request #486 from dereuromark/2.1-assertText
added missing assertText methods to assert cross OS
2012-02-17 17:36:13 -08:00
euromark
77624552eb added missing assertText methods to assert cross OS 2012-02-17 23:36:57 +01:00
José Lorenzo Rodríguez
bc98a5ec65 Merge pull request #484 from majna/2.1-apidocs
Fixed Folder::tree(), docblocks and removed a bunch of unused code
2012-02-17 13:57:48 -08:00
Majna
0cd9a93e9e Remove unused variables and statements. 2012-02-17 21:10:43 +01:00
Majna
c40d132f81 Fix Folder::tree() when excluding dot files or folders.
When 'exclude' param is array('.') files/folders are not skipped. Added test.
2012-02-17 20:46:52 +01:00
dogmatic69
be49b2b942 fixing up the docs for Collection::attached(), was showing behaviors but is for all collections 2012-02-17 13:25:37 +00:00
Majna
1dbafe1d4f Fix docblocks. 2012-02-17 13:51:20 +01:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Kyle Robinson Young
0c27a26cb8 Use ComponentCollection and AclComponent on DbAclTest to avoid error 2012-02-16 22:57:31 -08:00
Kyle Robinson Young
75882507bc Remove unnecessary loadFixtures() calls 2012-02-16 22:37:18 -08:00
Kyle Robinson Young
95b8675637 Cleaning up ModelCrossSchemaHabtm test case 2012-02-16 22:25:53 -08:00
Kyle Robinson Young
2d43f1873c Fix docblock of CakeFixtureManager::loadSingle() 2012-02-16 21:45:37 -08:00
Kyle Robinson Young
4141a3ab5b Load specific test plugins rather than all to avoid conflicts 2012-02-16 20:03:44 -08:00
Tigran Gabrielyan
af2fd03590 Added startText feature to HtmlHelper::getCrumbList() 2012-02-16 19:17:43 -08:00
mark_story
14228fa469 Fix more tests to use assertTextEquals()
Refs #2148
2012-02-16 21:51:56 -05:00
euromark
2afece41a0 email component osFix removal due to new assertTextEquals 2012-02-16 21:34:43 -05:00
mark_story
6412797dfc Add missing static. 2012-02-16 20:58:43 -05:00
Kyle Robinson Young
9fdc17eb1f Fix failing AuthComponent test 2012-02-16 15:58:42 -08:00
José Lorenzo Rodríguez
42711028ab Merge pull request #481 from majna/2.1-cleanup-tests
Fix missing and invalid assertions in tests
2012-02-16 13:07:37 -08:00
Majna
d41e5621b7 Fix missing and invalid assertions in tests.
Remove unused variables and dead code.
2012-02-16 19:28:21 +01:00
José Lorenzo Rodríguez
ed445d8b82 Merge pull request #480 from dogmatic69/join-issue
Fixing possible ambiguos column name in find
2012-02-16 09:08:18 -08:00
dogmatic69
3246cf7c1e adding the model alias so that there are no issues when the find has a join on it 2012-02-16 16:22:45 +00:00
ADmad
5c792aa831 Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit. 2012-02-16 18:15:12 +05:30
Mark Story
df0d1d681f Merge pull request #479 from slygoncito/0dace174a79b87a2a196cc2bc94dbb009b705878
Option 'currentClass' always defaults to 'current'.
2012-02-15 20:05:50 -08:00
Slygoncito
0dace174a7 Option 'currentClass' always defaults to 'current'. 2012-02-16 00:11:43 -03:00
ADmad
bda05293d7 Fixed failing test cases 2012-02-16 02:22:20 +05:30
ADmad
c7cfd45884 Syncing bake skeleton with app 2012-02-16 01:58:11 +05:30
ADmad
90f4c03627 Moving view files from core to app 2012-02-16 01:58:11 +05:30
mark_story
6fda055a1e Move initialize logic to __construct().
Fixes #2582
2012-02-15 14:15:44 -05:00
ADmad
55f63bbd5b Fixing error message. Closes #2579 2012-02-15 12:41:01 +05:30
mark_story
27367b491a Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
	lib/Cake/View/Helper/TextHelper.php
2012-02-14 21:55:21 -05:00
Mark Story
ba249aeff6 Merge pull request #477 from krolow/ticket-2574
fixing regex of autoLinks to work with urls that have www
2012-02-14 17:29:20 -08:00
Rachman Chavik
89d4b58073 fix indentation and add __construct() docblocks 2012-02-14 23:28:57 +07:00
Rachman Chavik
5eb1979b04 rename protected variable to $_engine 2012-02-14 23:28:57 +07:00
Rachman Chavik
fe479c636c adding tests for engine overrides 2012-02-14 23:28:57 +07:00
AD7six
369d316835 Restructure internals of Extract task
Use variables which are easily identifiable and an internal storage
structure which prevents duplicates.
2012-02-14 15:30:09 +01:00
Vinícius Krolow
07adcfe2f7 fixing regex of autoLinks to work with urls that have www 2012-02-14 11:08:37 -02:00
Rachman Chavik
5d9598673e Merge branch '2.1-helper-refactor2' into 2.1 2012-02-14 09:35:26 +07:00
Rachman Chavik
d6fd051fb4 changing methods in CakeTime class to static 2012-02-14 09:34:36 +07:00
Rachman Chavik
9624c27ef4 changing methods in CakeNumber class to static 2012-02-14 09:34:36 +07:00
Rachman Chavik
abd6d22445 changing methods in String class to static 2012-02-14 09:34:36 +07:00
mark_story
25ee90ace4 Fix failing tests. 2012-02-13 21:28:07 -05:00
mark_story
76711c9f71 Add missing rawurlencode()
When routes fail to match because of unknown named parameters,
values that needed urlencoding were missing it.

Fixes #2572
2012-02-13 21:16:57 -05:00
mark_story
afecb713ab Make button type nullable.
Fixes #GH365
2012-02-13 21:00:57 -05:00
Mark Story
d46127e3ad Merge pull request #470 from tPl0ch/2.1-cookie-response
Refactored setting of Cookies into CakeResponse.
2012-02-13 17:31:42 -08:00