Commit graph

5781 commits

Author SHA1 Message Date
gwoo
5f87f74b09 setting version to 1.2.4.8284
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8284 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 20:53:50 +00:00
gwoo
b3b7eb0f94 Merge branch '1.2' 2009-08-03 13:24:49 -07:00
gwoo
6775e0997e Merge branch '1.2' into 1.3 2009-08-03 13:13:18 -07:00
gwoo
92fd7cf6f3 Merge branch 'local/svn/1.2.x.x' into 1.2 2009-08-03 12:44:11 -07:00
jperras
d41a28c975 Fixing PHP4 compatibility issues for SecurityComponent.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8282 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 19:40:02 +00:00
mark_story
72d90f2ce8 Adding tests for array_diff_key() in php4. Increasing test compatibility with php4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8281 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 19:24:38 +00:00
gwoo
40ff8370e4 Merge branch 'local/svn/1.2.x.x' into 1.2 2009-08-03 11:59:02 -07:00
gwoo
33adb6e40b fixing test header from bad merge 2009-08-03 11:57:39 -07:00
gwoo
946f0c85fc Merge branch '1.3-jshelper' into 1.3 2009-08-03 11:55:40 -07:00
gwoo
01cbaafbf3 Merge branch '1.3-dev' into 1.3 2009-08-03 11:55:26 -07:00
gwoo
b2f7cd5aff fixing cache error 2009-08-03 11:55:14 -07:00
mark_story
6ca2127aea Fixing JsHelper tests to run in php4 2009-08-03 14:47:36 -04:00
gwoo
c33437af76 updating require of overloadbale in model 2009-08-03 11:44:06 -07:00
mark_story
d69772952c Fixing fatal error in php4 2009-08-03 14:42:33 -04:00
mark_story
83a705f739 Merge branch '1.3' into 1.3-jshelper 2009-08-03 14:39:21 -04:00
gwoo
57552c25fc updating some tests for php4
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8280 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 18:14:12 +00:00
mark_story
303b488bc1 fixing doc block indentation.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8279 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 18:13:46 +00:00
mark_story
bab62df0d8 Fixing fails caused by PHP4 and all lowercase classnames.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8278 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 18:12:42 +00:00
mark_story
401796e1a9 Adding missing reference operators in Controller::paginate().
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8277 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 17:55:16 +00:00
mark_story
29dd4ddf03 Fixing issues in Scaffold Test case with PHP4.
Cleaning up code formatting in Scaffold.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8276 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 17:38:40 +00:00
AD7six
47d50b1d93 Adding failing test case for invalid cache config causing a fatal error 2009-08-03 18:17:20 +02:00
gwoo
d15a9617f1 Merge branch '1.3-dev' into 1.3 2009-08-02 21:59:10 -07:00
jperras
33370fdc60 Fixing code coverage manager test. 2009-08-03 00:14:15 -04:00
jperras
6e7219b7ec Fixing no_database group test. 2009-08-03 00:02:17 -04:00
gwoo
400e1b2e3b Merge branch '1.3-dev' into 1.3 2009-08-02 20:13:22 -07:00
jperras
74e6b30d7b Removing duplicate classes & methods from a lost merge. 2009-08-02 22:59:15 -04:00
jperras
a0b04ed924 Adding proper skipIf to Javascript asset timestamp test. 2009-08-02 22:54:05 -04:00
jperras
43a7dee08a Fixing path for cake schema test in database group 2009-08-02 22:53:35 -04:00
gwoo
e3f8ee493e fixing path in folder test 2009-08-02 22:47:26 -04:00
gwoo
788cae1c6f Merge branch '1.3-dev' into 1.3 2009-08-02 19:46:27 -07:00
gwoo
5055ce3049 fixing path in folder test 2009-08-02 19:30:16 -07:00
jperras
31321df6ce Removing extra newline that was causing EmailComponent test to fail. 2009-08-02 21:09:33 -04:00
mark_story
4583873379 Fixing issues in PluginTask test due to addition of cake/plugins. Fixing undefined variable. 2009-08-02 20:42:08 -04:00
gwoo
2ae5d45180 fixing return of Folder::read when path is null 2009-08-02 17:22:57 -07:00
gwoo
d0c7397d5d added unlink to SchemaTest::tearDown() 2009-08-02 16:47:15 -07:00
gwoo
42d6a6f732 Merge branch '1.3-bake' into 1.3 2009-08-02 16:42:21 -07:00
gwoo
07d1ecdf6d adding change to DboSource test that was not committed in [8267]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8275 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 23:21:24 +00:00
gwoo
d905c274c8 Merge branch '1.2' into 1.3 2009-08-02 16:18:25 -07:00
gwoo
27fd80e040 Merge branch 'local/svn/1.2.x.x' into 1.2 2009-08-02 16:18:18 -07:00
AD7six
a4bc755cc7 whitespace normalization 2009-08-02 16:10:24 -07:00
AD7six
993643dd2a whitespace normalization 2009-08-02 16:10:12 -07:00
AD7six
b9987e1712 whitespace normalization 2009-08-02 16:09:39 -07:00
gwoo
15ed658a27 Revert "Merge branch '1.3-newlines' into 1.3"
This reverts commit c088131cd8e9f53396852e8a320e2b0396807d20, reversing
changes made to 9341a2bb5eda1db208019aa8a9171224fb76fc6b.
2009-08-02 15:59:54 -07:00
gwoo
ffe801bb28 fixing folder class when path give does not exist 2009-08-02 15:42:27 -07:00
gwoo
f9f67a1759 fixing some test cases 2009-08-02 15:18:44 -07:00
mark_story
48a483e5ce Fixing bake and bake related task test cases for PHP4. 2009-08-02 18:17:31 -04:00
AD7six
c1b919aba7 ignoring the contents of the plugins dir 2009-08-02 15:03:54 -07:00
AD7six
94e986561b allowing install/cake-wide plugins 2009-08-02 15:01:15 -07:00
AD7six
593bec85b7 adding tests for plugin file structure changes 2009-08-02 23:41:56 +02:00
AD7six
20b1dd795d Revert "Changing the Plugin task to take the dirs to create from the App skeleton"
This reverts commit fe8b641cd3257b4aa82ce93ac8a2e8f624e4ec58.

Conflicts:

	cake/console/libs/tasks/plugin.php
2009-08-02 23:39:59 +02:00