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
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
2ae5d45180
fixing return of Folder::read when path is null
2009-08-02 17:22:57 -07:00
AD7six
a4bc755cc7
whitespace normalization
2009-08-02 16:10:24 -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
AD7six
94e986561b
allowing install/cake-wide plugins
2009-08-02 15:01:15 -07: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
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
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
38221e7aa2
Merge branch '1.2' into 1.3
2009-08-01 23:47:28 -07: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
3aa6d22c2c
Correcting path that CakeSchema looks for schema files in.
2009-08-01 17:50:03 -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
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
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
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
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
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
DarkAngelBGE
f710ae7fbe
Minor refactorings + fix for dbo mysqli related to previous commit
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8261 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 20:08:24 +00: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
mark_story
47cd941b53
Applying optimization patch to PaginatorHelper and test refactorings to PaginatorHelper test case. Thanks Phally. Fixes #6526
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8259 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 12:40:31 +00:00
DarkAngelBGE
9da7b6ef55
Bringing Router coverage up to 94.45%, minor router refactorings
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8258 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-28 09:49:27 +00:00
AD7six
3b1664b7dd
Preventing loading the ConnectionManager from triggering reloading the Model file
2009-07-28 08:36:55 +02:00