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
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
evilbloodydemon
ad73c7038c
Unused variables in Network removed
2011-04-23 00:02:08 +04:00
Jose Lorenzo Rodriguez
c83a396eb4
Fixing class loading for HttpResponse classes, and making possible to pass plugin HttpResponse classes too
2011-04-10 16:57:44 -04:30
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
1f6346c58f
using cake_error for error messages
2011-03-19 18:18:14 +01:00
AD7six
29b874e739
translation changes in the Network dir
2011-03-12 20:01:38 +01:00
José Lorenzo Rodríguez
0cb08a09dc
Fixing class loading for authentication clasess in HttpSocket, also allowing the use of plugin authentication classes
2011-02-21 23:58:46 -04:30
José Lorenzo Rodríguez
4c0e06c451
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
387281e506
Moving newly created classes to the new folders
2010-12-15 01:32:37 -04:30
