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
gwoo
2dcb661b49
Merge branch '1.3-console' of dev@code.cakephp.org:cakephp into 1.3-console
2009-08-01 23:50:12 -07:00
gwoo
38221e7aa2
Merge branch '1.2' into 1.3
2009-08-01 23:47:28 -07:00
gwoo
8f8251adf4
Merge branch 'local/svn/1.2.x.x' into 1.2
2009-08-01 23:45:01 -07:00
mark_story
ce64f2fa6e
reformatting help() to fit on 80 col displays.
2009-08-01 21:23:06 -04:00
davidpersson
1a1fef6030
Updating commented Inflector code in app bootstrap.
2009-08-02 03:14:10 +02: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
a599f53c63
Fixing _getNodeId()
2009-08-01 20:21:22 -04:00
mark_story
acaba022c6
Updating delete() and adding test cases. Refactoring out common methods.
2009-08-01 20:17:44 -04:00
jperras
12e4db0810
Rewriting HttpSocket::parseCookies() to not use a negative lookbehind regex, due to a bug in PCRE engine in PHP 5.1.x. Fixes #6533 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8269 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 23:38:26 +00:00
mark_story
449c390d48
Refactoring out Model.fk parsing. Updating create(). Adding tests.
2009-08-01 18:57:54 -04:00
mark_story
3aa6d22c2c
Correcting path that CakeSchema looks for schema files in.
2009-08-01 17:50:03 -04:00
mark_story
b2ac7661b3
Adding E_DEPRECATED to console environment.
2009-08-01 17:49:21 -04:00
mark_story
f658f17b7e
Merge branch '1.3' into 1.3-console
2009-08-01 17:22:39 -04:00
jperras
5172035e02
Adding table prefix detection for sequence maps in DboOracle::describe(). Fixes #6527 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8268 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 19:40:52 +00:00
gwoo
887f8335ee
fixes #6539 quoting in buildIndex
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8267 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 18:25:25 +00:00
nate
7847044711
Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit.
2009-08-01 08:36:57 -04:00
mark_story
878f3367d4
Updating doc block on JavascriptHelper::object(). Thanks BrendonKox. Fixes #6540 .
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8266 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-01 06:24:55 +00:00
nate
e47b1960ad
Merge branch '1.3' of dev@code.cakephp.org:cakephp into 1.3
2009-07-31 11:54:01 -04:00
nate
729d8fddea
Applying PHP 5.3 compatibility patch from Mark Story. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly.
2009-07-31 11:48:30 -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
gwoo
01d22ffd2e
fixing up some App::import calls
2009-07-30 15:01:22 -07:00
AD7six
77f371d1e1
Merge branch '1.3-bake' of dev@code.cakephp.org:cakephp into 1.3-bake
2009-07-30 22:14:51 +02:00
jperras
bc28dd834e
Adding additional plural inflection rule.
2009-07-30 15:29:16 -04:00
gwoo
1e88afdc5a
Merge branch '1.3-console' of dev@code.cakephp.org:cakephp into 1.3-console
2009-07-30 11:35:49 -07: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
8e152ada32
Updating model import()
2009-07-30 10:07:58 -04:00
mark_story
6322375889
Merge branch '1.3' into 1.3-bake
2009-07-30 09:23:16 -04:00
mark_story
6d1c38c1cc
expanding doc blocks.
2009-07-29 22:48:40 -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
