Commit graph

5607 commits

Author SHA1 Message Date
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
AD7six
db6f2cec96 Revert "Changing folder create logic to use Folder->tree"
This reverts commit a60677070d41f3a1c7841e4ca24f6ee2658f3067.
2009-08-02 23:26:15 +02:00
AD7six
a0bd6e9db5 Merge branch '1.3' into 1.3-bake 2009-08-02 23:23:15 +02:00
AD7six
60154b64be Allowing the running of all core test cases via the console 2009-08-02 23:20:59 +02:00
AD7six
982f161559 Merge branch '1.3' into 1.3-console 2009-08-02 22:50:36 +02:00
AD7six
5b8b9923a1 Reverting path change 2009-08-02 22:50:23 +02:00
AD7six
d61e8736e4 Merge branch '1.3' into 1.3-bake 2009-08-02 22:44:28 +02:00
AD7six
7eb150b49a Merge branch '1.3' into 1.3-bake
Conflicts:
	cake/console/libs/tasks/model.php
2009-08-02 22:31:01 +02:00
gwoo
c017f80e02 Merge branch '1.2' into 1.3 2009-08-02 13:25:55 -07:00
gwoo
be53897505 Merge branch 'local/svn/1.2.x.x' into 1.2 2009-08-02 13:25:47 -07:00
gwoo
9e4cb97026 Revert "allow running all core test cases via the console"
This reverts commit 86e5cc5a89e7307ebf827c688311cdbe945feb85.
2009-08-02 13:19:16 -07:00
AD7six
6d6f97de59 This will be implemented in the Folder class itself
Revert "preventing the possibility of trying to delete / if the test dir wasn't created correctly"

This reverts commit 61c9771e7d163d8e7131a07a304b5a8dd6a3696a.
2009-08-02 22:00:57 +02:00
gwoo
292b37c6e8 Merge branch '1.3-console' into 1.3 2009-08-02 12:31:12 -07:00
gwoo
bf2b8a60e6 Merge branch '1.3-misc' into 1.3 2009-08-02 12:20:07 -07:00
jperras
3f46bf9568 Updating doc block for Model::invalidate. Fixes #4583.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8274 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 19:18:54 +00:00
jperras
6b0bbc44bb Updating doc block for Object::requestAction. Fixes #6391.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8273 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 19:12:02 +00:00
gwoo
d118c6a764 Merge branch '1.3-newlines' into 1.3 2009-08-02 12:08:55 -07:00
jperras
f426017a9e Changing l10n language name from 'Slovack' to 'Slovak', as per ISO 693-1 guidelines. Thanks to savant for the patch. Fixes #5870.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8272 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 19:00:30 +00:00
gwoo
7fc465309e Merge branch '1.2' into 1.3 2009-08-02 11:58:39 -07:00
gwoo
be9d9a694b Merge branch 'local/svn/1.2.x.x' into 1.2 2009-08-02 11:58:23 -07:00
jperras
70c331f5db Updating doc blocks for paginator helper. Thanks to savant for the patch. Fixes #4994.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8271 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 18:55:37 +00:00
jperras
e9e8951a27 Updating doc blocks for datasource - thanks to savant for patch. Fixes #5738.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8270 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-02 18:52:55 +00:00
gwoo
c7050c9879 Merge branch '1.3-inflector' into 1.3 2009-08-01 23:53:36 -07:00