Commit graph

10471 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
d83555cc52 Merge remote-tracking branch 'origin/1.3' into merger
Conflicts:
	cake/console/cake.php
	cake/dispatcher.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/controller.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/pages/home.ctp
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/xml.test.php
	lib/Cake/Console/Command/SchemaShell.php
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Network/Http/HttpSocket.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/View/Helper/TextHelper.php
	lib/Cake/View/Helper/TimeHelper.php
	lib/Cake/config/config.php
	lib/Cake/tests/Case/Cache/CacheTest.php
	lib/Cake/tests/Case/Model/CakeSchemaTest.php
	lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
2011-05-04 01:10:23 -04:30
Jose Lorenzo Rodriguez
492f1ce12e Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-05-03 23:05:38 -04:30
mark_story
aca8cc8b77 Fixing issue where content types wouldn't be detected as once parseExtensions() is enabled the extension will always
default to html.
2011-05-02 22:26:58 -04:00
ADmad
7fc5e8f810 Fixing typo 2011-05-03 01:01:33 +05:30
mark_story
317aad9526 Fixing missing uses for Controller Task.
Fixing incorrect import() for ClassRegistry.
2011-05-01 14:58:32 -04:00
mark_story
1c417ac2fd Removing dead code, and adding another deprecation warning. 2011-05-01 14:17:33 -04:00
ADmad
1cb0e413be Enhancing App::build() to allow appending paths. Closes #1680 2011-05-01 20:54:52 +05:30
mark_story
093d7f1064 Merge branch 'request-input' into 2.0 2011-05-01 10:25:39 -04:00
mark_story
512e570202 Adding ability to map arbitrary content types and decoding methods to RequestHandlerComponent.
Removing hardcoded XML decoding, but continuing to provide the functionality.
Adding default support for JSON decoding.
Fixing stdin/input mixup.
Fixes #716
2011-05-01 10:21:00 -04:00
ADmad
75437b45d9 Fixed error where App::import() failed to load new class types added in 2.0. Also fixed couple of test cases. 2011-05-01 03:19:44 +05:30
mark_story
0be0b0ede0 Removing $request->params['form'], all POST data is available at $request->data, there is no point for it to be in two
places.  Updating tests as well.
2011-04-30 14:12:51 -04:00
mark_story
47176bffc5 Fixing failing tests that waited on stdin indefinetly. 2011-04-30 13:27:57 -04:00
mark_story
53b4a129ba Changing RequestHandler to use CakeRequest::input() 2011-04-30 13:09:30 -04:00
mark_story
40fab8135a Adding ability to pass params to the decoding function. 2011-04-30 13:05:10 -04:00
mark_story
975f74bb44 Making it so all POST parameters are available on $this->data inside the request. This makes one fewer place POST data
is found.  $this->params['form'] is still around as well for Backwards compatibility, but is not recommended for use
going forward.
2011-04-30 12:44:38 -04:00
mark_story
60ee04a0fb Adding first kick at the can for reading request body input.
Adding testcases.
2011-04-30 12:44:37 -04:00
mark_story
d9c7f4df66 Fixing import of MediaView in dispatcher so Media models used in Routing don't interfere with asset delivery.
Fixes #1670
2011-04-30 12:42:08 -04:00
José Lorenzo Rodríguez
10d735fcf8 Merged pull request #65 from English360/i1663.
Fix issue 1663: wrong i18n usage in TimeHelper
2011-04-29 12:26:25 -07:00
José Lorenzo Rodríguez
d61ebaee5d Merged pull request #64 from sonnygauran/2.0.
Updating database.php file generation to match changes on ConnectionManager
2011-04-29 12:13:07 -07:00
Mariano Iglesias
cc5670a33f Fixing issue with wrong internationalization of time ago expressions in TimeHelper. Fixes #1663 2011-04-29 15:48:00 -03:00
Sonny Gauran
4add005baa Fixed baked database.php constants 2011-04-30 02:12:15 +08:00
Jose Lorenzo Rodriguez
07b84a71ab Removing unneeded assignments by reference 2011-04-29 11:49:46 -04:30
Juan Basso
50206f4315 Fixed invalid PhpDoc tag. 2011-04-28 21:25:18 -04:00
AD7six
54429837b4 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-04-28 15:17:24 +02:00
AD7six
d861a73327 update basics to match code standards
global functions are not indented
2011-04-28 15:16:55 +02:00
mark_story
5273080962 Merge branch 'torifat-set' into 1.3 2011-04-27 22:42:02 -04:00
Rifat Nabi
03ffa3d152 ticket #989 test case added 2011-04-27 16:01:08 +06:00
Rifat Nabi
7812223eb5 fixed! ticket #989, Set::extract replacing first index with an index of same key [0] one step lower 2011-04-27 15:21:25 +06:00
Jose Lorenzo Rodriguez
228230e67b Simplifying code 2011-04-27 00:15:42 -04:30
Juan Basso
84538ac10a Fixed the tests of MediaView in console/web. 2011-04-27 00:26:57 -04:00
Jose Lorenzo Rodriguez
ab9b7f44dc Merge remote-tracking branch 'origin/2.0' into 2.0 2011-04-26 23:44:56 -04:30
Jose Lorenzo Rodriguez
8da7e5fa82 Lazy loading models in controllers, now declaring multiple models in $uses is not a performance hit anymore 2011-04-26 23:44:32 -04:30
Thomas Ploch
bea666bb12 Removed JsBaseEngineHelper::$useNative. Removed json_encode() emulation from JsBaseEngineHelper::object(). Removed unnessecary call to get_object_vars() in JsBaseEngineHelper::object(). Removed unnessecary tests for equalness of emulation and native json_encode(). Added test for correct encoding of objects to JsHelper test case. Fixes #704 2011-04-26 22:35:33 -04:00
Juan Basso
1523ff6874 Moved the CakeEmail to Network/Email. Now this class have similar structure of HttpSocket. 2011-04-26 22:20:35 -04:00
evilbloodydemon
df57b15f89 Removed undefined variable in App::core, made test pass on Windows.
Signed-off-by: mark_story <mark@mark-story.com>
2011-04-26 22:18:51 -04:00
Juan Basso
1962e40c9a Added tests to get with queryparams and custom configs. Refs #1674. 2011-04-26 22:10:24 -04:00
Jose Lorenzo Rodriguez
3433d123d4 Removing model id assignment form passedArgs, as it causes unexpected results. Closes #536 2011-04-26 21:30:12 -04:30
Thomas Ploch
9db411d9e4 Added HttpSocket::config['request']['uri'] as parameter in HttpSocket::_parseUri() called by HttpSocket::get(). Now creates correct request array for GET if query params are given and the default request should be used. Fixes #1674. No tests modified since behaviour didn't change. 2011-04-26 19:15:25 -04:00
José Lorenzo Rodríguez
c4c35f2539 Merged pull request #62 from evilbloodydemon/unused-vars.
Fixed typo in variable name
2011-04-26 10:53:16 -07:00
evilbloodydemon
1d7d20768f Fixed typo in variable name 2011-04-26 21:44:37 +04:00
José Lorenzo Rodríguez
169c330086 Merged pull request #61 from sime/master.
Documentation for schema update missing -f param
2011-04-26 08:13:04 -07:00
Simon Males
7feaa0f5a2 schema update documentation lacked -f param usage. 2011-04-26 07:15:32 -07:00
mark_story
b31f25fb8b Fixing issues rendering repeat errors coming from the rendering of an error page (like a missing helper).
Test added. Fixes #1671
2011-04-25 21:09:53 -04:00
Renan Gonçalves
170ba71850 Changing the visiblity from private to protected, for extensibility sake. 2011-04-25 22:08:12 +02:00
Renan Gonçalves
9da76a8655 Fixing a couple of typos from last commit. 2011-04-25 21:35:27 +02:00
Renan Gonçalves
abbe5aaea2 Updating console to use i18n'ed strings. 2011-04-25 21:24:16 +02:00
Renan Gonçalves
3251faf8e9 Expliciting methods visibility.
No need to keep track of line anymore, token_get_all (PHP 5.2.2) returns it.
... and fixing some grammar typos on the way.
2011-04-25 21:24:07 +02:00
Renan Gonçalves
cd3529c986 Implementing support to multiline string in __*() calls. 2011-04-25 21:23:56 +02:00
Juan Basso
43a95a79fc Fixed the tests to run in Windows and different browsers. 2011-04-24 23:40:48 -04:00
Juan Basso
6ec61746fd Added the email folder to all network tests. 2011-04-24 23:40:46 -04:00