Commit graph

5970 commits

Author SHA1 Message Date
mark_story
f33329ae43 Merge branch 'acl-behavior' into 2.0
Conflicts:
	cake/libs/model/behaviors/acl.php
	cake/tests/cases/libs/model/behaviors/acl.test.php
2011-03-19 10:14:10 -04:00
mark_story
4118477c0a Merge branch '1.3' into merger
Conflicts:
	cake/console/templates/default/views/index.ctp
	cake/libs/cache.php
	cake/libs/cake_log.php
	cake/libs/cake_socket.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/libs/view/helpers/js.test.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2011-03-19 09:08:28 -04:00
mark_story
9c860d2ce8 Changing how CakeLog registers itself as the error handler, this fixes issues with e-accelerator on some platforms. Fixes #1597, fixes #1087 2011-03-19 08:54:07 -04:00
mark_story
6d2b31d4d1 Fixing issues with plugin models used in habtm 'with' keys. Fixes #1548 2011-03-19 08:45:10 -04:00
mark_story
9ae8dcafdc Updating documentation to include new option. 2011-03-15 22:05:14 -04:00
hiromi2424
38e85ebd6e Supported default ion for FormHelper::checkbox(). Test added fixes #805
Signed-off-by: mark_story <mark@mark-story.com>
2011-03-15 22:03:04 -04:00
mark_story
4537499ea9 Updating doc block. 2011-03-15 21:39:15 -04:00
mark_story
c6b7482308 Making sure forms always have a generated id attribute. Updating tests. 2011-03-15 21:19:15 -04:00
mark_story
b9ec7da21d Applying patch from 'NaMB' to add disabled support to FormHelper::radio(). Test cases added as well. Fixes #1459 2011-03-13 19:35:37 -04:00
mark_story
31e82b08df More documentation for Cache. 2011-03-12 12:14:43 -05:00
mark_story
20299c9138 Removing duplicate package string.
Updating FileEngine tests to use file_test config instead of inheriting 'default' as default could be an APC config now.
Removing tests that were testing clearCache(), as that is not part of FileEngine's features.
2011-03-12 12:06:10 -05:00
mark_story
70d334f7eb Moving core cache configuration out of Configure and into core.php.
This makes the cache configurations cake uses internally more
transparent, and easier for the end developer to configure. Fixes #1586
2011-03-12 11:24:59 -05:00
mark_story
d0dfd7f18c Removing more calls to strtolower(). Instead type the method names with the correct casing. 2011-03-12 11:10:31 -05:00
ADmad
0f341c7114 Fixed bug where default class name 'checkbox' was dropped in case of validation error for div wrapping checkbox for multiple checkboxes 2011-03-11 20:20:55 +05:30
mark_story
7f18f05de4 Moving appending of prefix to action into the Router. This makes Router::parse() always return what you get in the controller.
Updating Dispatcher to not hold a reference to the current request, as its not used.
Updating private action detection so its simpler.
Fixes issues with prefix actions not getting the correct default view.  Fixes #1580
2011-03-10 22:04:46 -05:00
mark_story
b292f4ffaa Fixing tests that were failing due to missing methods, and changes in CakeRoute.
Making ExceptionRenderer pass in the current request to the controller
constructor.  This fixes fatal errors on PrivateActionExceptions.
2011-03-10 22:01:56 -05:00
mark_story
ab4ce97cad Fixin CakeErrorController's constructor, so it matches the parent class. Removing duplicated code. 2011-03-10 22:00:08 -05:00
mark_story
0cc55d8f45 Removing calls to Dispatcher::_stop(). Updating tests. Fixes #1578 2011-03-09 22:27:19 -05:00
ADmad
95d44c3694 Updating example code in comment to reflect renaming of Controller::$view to Controller::$viewClass. Closes #1579 2011-03-10 04:00:14 +05:30
mark_story
c8f33b77a1 Fixing failing tests, and issues around Controller::$view not getting
set properly.
2011-03-09 07:31:11 -05:00
mark_story
5bb173013e Adding doc block info for Cache::config. 2011-03-07 22:17:52 -05:00
Clément Hallet
e2b37d8ec9 Allow to disable cache gc. By using a falsey value for probability
you can disable cache gc calls.
2011-03-07 22:06:46 -05:00
mark_story
7853189328 Adding 'style' as a known html attribute. Fixes #1573 2011-03-07 21:58:11 -05:00
mark_story
de57802f05 Fixing left over action from previos refactoring of viewClass/view. 2011-03-07 21:50:53 -05:00
mark_story
0d3288bab0 Refactoring protected methods. 2011-03-03 21:34:54 -05:00
mark_story
b8aa78ce9f Making a method protected, it doesn't need to public really. 2011-03-03 21:16:43 -05:00
mark_story
2e76d32cf9 Fixing transposition of parameters to setLastError. Fixes #1570 2011-03-03 20:46:43 -05:00
mark_story
9cf940853b Updating router tests to use/expect greedyNamed.
Removing code that has been moved to CakeRoute or is no longer needed.
2011-03-03 07:32:06 -05:00
mark_story
217938a970 Moving pass key restructuring into CakeRoute.
Adding tests for that and http header matching.
2011-03-03 07:30:22 -05:00
mark_story
171830df33 Minor cleanup and reformattting.
Changing greedy -> greedyNamed for clarity and consistency.
2011-03-03 07:11:32 -05:00
mark_story
15275eddac Moving matchNamed() into CakeRoute. This will allow its removal from Router. 2011-03-03 06:54:46 -05:00
mark_story
97175aac90 Making greedy -> greedyNamed its clearer and doesn't consume a possibly easy to use named parameter key.
Expanding tests for named parameter rules/conditions.
2011-03-03 06:49:11 -05:00
mark_story
3eef281e1c Adding tests for named parameter rules on the route level. 2011-03-03 06:36:02 -05:00
mark_story
cf26a8e430 Initial port of Router::getArgs() to CakeRoute. 2011-03-03 06:11:41 -05:00
mark_story
155db76825 Removing junk. 2011-03-03 05:50:58 -05:00
mark_story
b70a512470 Moving Router::$named to be protected, and adding an accessor method. This will help with later refactoring. 2011-03-02 22:08:30 -05:00
mark_story
5e3cd74b03 Replacing request->here with request->here(). Saves a call to Router::normalize() in a few places. 2011-03-02 22:04:51 -05:00
mark_story
a6abd61f3f Removing Dispatcher::$here, it wasn't really used outside of a cached() which had a param that it just ignored. Making Dispatcher::cached() pay attention to its parameter.
Updating tests.
2011-03-02 21:52:25 -05:00
mark_story
af16b13e5f Fixing issues with double base dir in FormHelper::create(). Fixes #1568 2011-03-02 21:47:11 -05:00
mark_story
2145fd8078 Adding CakeRequest::here() for getting complete 'here' values including query string parameters. $request->here does not include query string params.
Adding test cases.
2011-03-02 21:46:28 -05:00
mark_story
7526d017f0 Clarifying what tld means. 2011-03-02 21:00:53 -05:00
mark_story
197c9bf912 Making empty string create empty submit buttons. This applies to both Form->submit() and Form->end(). Tests added. Fixes #1569 2011-03-02 20:27:57 -05:00
mark_story
7891143cd9 Removing repetitive strtoupper call. 2011-03-02 05:46:27 -05:00
mark_story
e3841955dc Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-03-01 22:23:57 -05:00
mark_story
3ea8c2246a Merge branch '1.3' into merger
Conflicts:
	cake/console/cake.php
	cake/dispatcher.php
	cake/libs/controller/components/cookie.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/lib/cake_test_fixture.php
2011-03-01 22:21:44 -05:00
Jeremy Harris
b138c84df3 Merge remote branch 'upstream/2.0' into 2.0 2011-03-01 19:02:34 -08:00
Jeremy Harris
06f9fc0fc9 Made form post to the current location by default. Fixes #1418 2011-03-01 17:31:02 -08:00
Jeremy Harris
2977448891 Added more options to NumberHelper::currency() to allow for better flexibility in defining formats. Fixes #1267 2011-03-01 17:14:15 -08:00
Ceeram
e9011badb5 Ensure both node() and afterSave() use ->name
Fixes #1564
2011-02-28 21:43:33 -05:00
Ceeram
dbd8199dad replaced use of model->alias by model->name, where these might cause issues, refers #346 2011-02-27 16:18:32 +01:00