Commit graph

2040 commits

Author SHA1 Message Date
mark_story
6ca2127aea Fixing JsHelper tests to run in php4 2009-08-03 14:47:36 -04:00
mark_story
83a705f739 Merge branch '1.3' into 1.3-jshelper 2009-08-03 14:39:21 -04:00
jperras
33370fdc60 Fixing code coverage manager test. 2009-08-03 00:14:15 -04: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
gwoo
e3f8ee493e fixing path in folder test 2009-08-02 22:47:26 -04: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
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
d905c274c8 Merge branch '1.2' into 1.3 2009-08-02 16:18:25 -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
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
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
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
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
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
c7050c9879 Merge branch '1.3-inflector' into 1.3 2009-08-01 23:53:36 -07:00
gwoo
38221e7aa2 Merge branch '1.2' into 1.3 2009-08-01 23:47:28 -07:00
mark_story
ca8744c8b9 Updating setParent() to use either Model.key or alias. Tests added. 2009-08-01 20:56:58 -04:00
mark_story
acaba022c6 Updating delete() and adding test cases. Refactoring out common methods. 2009-08-01 20:17:44 -04:00
mark_story
449c390d48 Refactoring out Model.fk parsing. Updating create(). Adding tests. 2009-08-01 18:57:54 -04:00
renan.saddam
76e50ef625 Adding support for Model.* syntax, which translates to a list of fields from Model.
Fixing buildColumn for null values.
Fixing small containable merge, it was duplicating values, tests added.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8265 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 02:08:20 +00:00
gwoo
9e1dec3ff3 fixes #6538, xml serialization on multi dimensional
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8264 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-31 01:50:14 +00:00
jperras
bc28dd834e Adding additional plural inflection rule. 2009-07-30 15:29:16 -04:00
gwoo
1423b0067b Merge branch '1.2' into 1.3 2009-07-30 11:34:33 -07:00
gwoo
6cb70f0929 Merge branch '1.3-console' into 1.3 2009-07-30 11:26:23 -07:00
mark_story
6322375889 Merge branch '1.3' into 1.3-bake 2009-07-30 09:23:16 -04:00
mark_story
3a5b782737 Adding newlines and tests for slideDown slideUp alternate syntax for jquery engine. 2009-07-29 22:37:41 -04:00
mark_story
5b13b29a92 Adding callbackArguments and parseCallbacks to jQuery engine. 2009-07-29 22:19:02 -04:00
renan.saddam
90445e9119 Fixing "DEFAULT NULL" sentence, which for some reason does not work. It needs to be only "NULL", and "DEFAULT NULL NULL" works too.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8263 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-30 00:00:19 +00:00
renan.saddam
ee8d12c939 Fixing issue with "DEFAULT NULL NULL" generated by buildColumn.
Making the tests pass by just changing the start and end quotes.
Providing "created" values for CakeTestFixtureTestFixture Fixture.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8262 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-29 22:30:20 +00:00
gwoo
aab4dc2f1a Merge branch '1.3-inflector' into 1.3 2009-07-29 10:32:25 -07:00
mark_story
189480e499 Correcting parameter names for ControllerTask. Updating tests in Controller and ViewTask. 2009-07-29 12:47:25 -04:00
AD7six
bbc2562d3f Correcting use of CONSOLE_LIBS to refer to template files 2009-07-29 10:17:06 +02:00
AD7six
d54369e29e CONSOLE_LIBS isn't an absolute path
Adding app vendor folders

Correcting plugin test to match changes to the task
2009-07-29 10:12:54 +02:00
AD7six
803d19c80e preventing the possibility of trying to delete / if the test dir wasn't created correctly
And the ensuing exception if permission is denied
2009-07-29 09:58:35 +02:00
mark_story
24299cf943 Implementing wrapped callbacks in Mootools. Fixing implementation in Prototype. Adding JsBaseEngineHelper::_processOptions() to reduce duplicate code.
Test cases appended and updated.
2009-07-29 00:05:27 -04:00
mark_story
9092b25004 Fixing how scaffold arg works, now generates scaffolds.
Making admin arg only make admin methods and new both arg make both admin and non admin methods.
Adding test cases.
Adding new line to template.
2009-07-28 22:53:29 -04:00
DarkAngelBGE
f88cc56cfe Coding standards fixes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8260 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:01:42 +00:00