Commit graph

9014 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
9caba98780 Merge branch '2.0' of github.com:cakephp/cakephp into feature/2.0/pdo 2010-11-08 22:40:09 -04:30
José Lorenzo Rodríguez
8c2f9e1d2b Removing E_STRICT errors from router 2010-11-08 22:38:30 -04:30
José Lorenzo Rodríguez
afa5ee6885 Removing E_STRICT errors from connection manager 2010-11-08 22:37:34 -04:30
José Lorenzo Rodríguez
2fa653d2f3 Removing E_STRICT errors from i18n 2010-11-08 22:37:09 -04:30
José Lorenzo Rodríguez
398adbbc7a Removing E_STRICT errors from debugger 2010-11-08 22:36:48 -04:30
José Lorenzo Rodríguez
4cba8a12a0 Removing E_STRICT errors from Configure and App class 2010-11-08 22:36:38 -04:30
José Lorenzo Rodríguez
62017b2e38 Removing E_STRICT errors from ClassRegistry 2010-11-08 22:35:55 -04:30
José Lorenzo Rodríguez
09011d1010 Removing E_STRICT errors from CakeSession 2010-11-08 22:35:31 -04:30
José Lorenzo Rodríguez
44e9783dea Removin E_STRICT errors from dispatcher 2010-11-08 22:35:10 -04:30
José Lorenzo Rodríguez
f93a759220 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-11-08 21:30:38 -04:30
Juan Basso
b413aa99d9 Removing instance by reference. 2010-11-08 23:51:45 -02:00
Jeremy Harris
c98306727d Merge branch '2.0-redirect' into 2.0 2010-11-07 17:42:04 -08:00
Jeremy Harris
7630580511 Added support for redirection routes. Fixes #1151 2010-11-07 17:33:05 -08:00
Jeremy Harris
060f149a84 Added configurable ellipsis on Paginator::numbers(), Paginator::first(), Paginator::last(). Fixes #1086 2010-11-07 17:08:01 -08:00
Jeremy Harris
b5deb41fb7 Merge remote branch 'upstream/2.0' into 2.0 2010-11-07 15:48:50 -08:00
Jeremy Harris
cad6fc7a17 Force console output tests to output as color 2010-11-07 15:41:40 -08:00
mark_story
5214c56f1b More instructions on how to install phpunit. 2010-11-07 18:02:19 -05:00
mark_story
b8cc605e21 Updating instructions for installing phpunit. 2010-11-07 18:00:22 -05:00
mark_story
af303f01c7 Fixing baked actions to use request object.
Fixes #1091
2010-11-07 01:08:58 -04:00
José Lorenzo Rodríguez
3a8016b875 Even more methods containing quoting specific to mysql out of DboSource 2010-11-03 19:59:15 -04:30
José Lorenzo Rodríguez
6028705c72 Moving more methods out from DboSourceTest 2010-11-03 19:52:49 -04:30
José Lorenzo Rodríguez
1c37751038 Adding missign option to testsuite shell 2010-11-03 19:41:17 -04:30
José Lorenzo Rodríguez
a39adf213e Adding missign option to testsuite shell 2010-11-03 19:40:48 -04:30
José Lorenzo Rodríguez
86f1309a54 iMoving a couple of methods out from DboSourceTest 2010-11-03 19:40:09 -04:30
José Lorenzo Rodríguez
f2f378ca73 Moving testGenerateInnerJoinAssociationQuery out from DboSourceTest 2010-11-03 19:35:15 -04:30
José Lorenzo Rodríguez
605a6b17a5 Moving another method out of DboSourceTest 2010-11-03 19:18:51 -04:30
José Lorenzo Rodríguez
146af7faa5 Stating to move quoting test out from dbosource into mysql test 2010-11-03 19:14:22 -04:30
José Lorenzo Rodríguez
3b133a4142 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-11-03 19:02:28 -04:30
José Lorenzo Rodríguez
224f65af05 Preventing bug in testsuite shell 2010-11-03 18:56:06 -04:30
José Lorenzo Rodríguez
557c5274e8 Making file argument optional in console testsuite in order to show complete list of test cases for a category 2010-11-03 01:27:37 -04:30
José Lorenzo Rodríguez
9afd4d7875 Fixing option parsing and help for testsuite after new console libraries merge 2010-11-03 01:25:27 -04:30
José Lorenzo Rodríguez
eedd823fd8 Merge remote branch 'origin/2.0' into feature/2.0/pdo 2010-11-03 00:23:18 -04:30
mark_story
bff711e2dc Merge branch '2.0-console' into 2.0
Conflicts:
	cake/console/shells/acl.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
2010-11-02 23:49:19 -04:00
Juan Basso
b0a600f925 Merge branch '2.0-post-method' into 2.0 2010-11-03 01:42:06 -02:00
Juan Basso
adb2d90b9a Changed the regex to follow the RFC 3986, working to protocols like "svn+ssh://" and "ed2k://" 2010-11-03 01:26:41 -02:00
mark_story
c9ca3c3785 Fixing path constants in DbConfig and FixtureTask to be more consistent between web and cli. 2010-11-02 23:25:36 -04:00
Juan Basso
b752766d6c Using full base when $url is empty. 2010-11-03 01:16:38 -02:00
mark_story
6d54202c4c Adding another group test case file for all the console tests at once. 2010-11-02 23:15:33 -04:00
Mark Story
94f9f7afeb Fixing failing tests from merge with 1.3. Most tests were failing due to internal changes and PHPUnit being more specific than SimpleTest. 2010-10-31 22:42:16 -04:00
Mark Story
a3da915abd Fixing issue where value in difference array was always the string value instead of the original value. 2010-10-31 22:41:33 -04:00
Mark Story
c2063f1229 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2010-10-31 21:58:38 -04:00
Mark Story
b67d3fac44 Updating FormHelper to fix failing test from merge. 2010-10-31 21:57:51 -04:00
Mark Story
08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
Juan Basso
7f448a1d35 Allowed the use of empty() and isset() in Controllers aliases properties. 2010-10-31 22:02:26 -02:00
Mark Story
b86bec14b5 Removing dead code in EmailComponent.
Fixes #1248
2010-10-31 00:00:54 -04:00
Juan Basso
e380b76e16 Created an exception to error 405 (Method Not Allowed) and changed the delete action in bake to use it. 2010-10-30 23:13:54 -02:00
Juan Basso
4eed660a62 Changed the form style to not affect layout. 2010-10-30 22:39:31 -02:00
Juan Basso
a040c9a218 Changed the cake bake to use postLink for delete actions. 2010-10-30 21:58:42 -02:00
Mark Story
d5f582beee Merge branch 'master' of http://github.com/kwiky/cakephp into kwicky 2010-10-30 00:29:21 -04:00
Mark Story
e9851a644b Merge branch 'form-selected' into 2.0 2010-10-30 00:08:21 -04:00