Commit graph

6243 commits

Author SHA1 Message Date
mark_story
6b5c247162 Merge commit 'origin/1.2' into mergers
Conflicts:
	cake/bootstrap.php
	cake/console/cake.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/libs/view/helpers/cache.test.php
2009-11-08 22:21:21 -05:00
mark_story
7981b44db4 Merge branch '1.3-misc' into mergers 2009-11-08 21:39:55 -05:00
mark_story
a7a6dc8c43 Fixing issue where SecurityComponent::_validatePost could generate notices if elements were removed from _Token array.
Tests Added
Fixed #228
2009-11-08 14:12:18 -05:00
mark_story
6b79c8d375 Adding checks for parent classname when converting error method names. Fixes #273 2009-11-08 14:07:25 -05:00
mark_story
95cafc7138 Adding missing help text. 2009-11-08 13:46:45 -05:00
mark_story
82a2b1a019 Changing import of Dispatcher to direct require.
Modifying order of operations in Configure::__loadBootstrap()
moving inclusion of app/config/bootstrap.php after the creation of core cache configs.  This allows App::import() to be used in the bootstrap file with cached paths.
2009-11-07 17:53:14 -05:00
mark_story
6db91b0f49 Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253 2009-11-07 17:43:18 -05:00
ceeram
dd0c4a64c5 Test to prove ticket #253 2009-11-07 11:02:43 -05:00
mark_story
30dc0cfe56 Removing unused $view property from CacheHelper.
Fixes #272
2009-11-07 10:44:14 -05:00
mark_story
4a08bd120d Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-07 10:41:12 -05:00
mark_story
4704a8cd00 Removing unused $view property from CacheHelper.
Fixes #272
2009-11-07 10:40:48 -05:00
ADmad
002a01a9d8 passedArgs from current request are auto merged with url options of paginator helper
Signed-off-by: Florian Krämer <florian.kraemer@cakedc.com>
2009-11-06 18:31:42 +01:00
mark_story
4deaf27cc0 Removing deprecated code in Html::css()
Minor refactoring in HtmlHelper methods.
Fixes #268
2009-11-06 09:31:57 -05:00
mark_story
ab76cb1217 Merge branch '1.3' into 1.3-misc 2009-11-06 09:25:11 -05:00
mark_story
e7c2fe2b7e Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-06 09:24:55 -05:00
SkieDr
ce15cc61d9 Fix order of keys in l10n catalog list 2009-11-06 15:46:54 +03:00
predominant
884490f1a1 Removing leftover SVN tags. 2009-11-06 18:35:14 +11:00
predominant
167c6e26c0 Removing more @filesource lines. 2009-11-06 18:12:27 +11:00
predominant
90248af9a4 Removing SVN lines. 2009-11-06 18:11:17 +11:00
predominant
62810fb4f4 Updating more Copyright dates. 2009-11-06 18:04:38 +11:00
predominant
1185681549 Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed Fixing links throughout 2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
5dfe1777af Removing Subversion file headers. 2009-11-06 16:51:09 +11:00
mark_story
4bbfcbff7e Fixing limit:0 and controller::paginate. Removes possibilty to generate sql errors by inputting invalid limit options. Tests updated. Refs #264 2009-11-06 00:44:21 -05:00
predominant
ceee56013c Remove Subversion $Date$ lines. 2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe Remove Subversion $LastChangedBy$ lines. 2009-11-06 16:11:16 +11:00
predominant
42f3f16d60 Remove subversion $Revision$ lines. 2009-11-06 16:08:02 +11:00
predominant
531eaaad4e Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-11-06 15:54:01 +11:00
Ernst Mayerhofer
0327f15395 paginator works with limit 0 now too 2009-11-05 23:44:02 -05:00
predominant
1b9b0aae5e Updating Copyright date to include 2009. 2009-11-06 15:34:28 +11:00
mark_story
e776cf1ad2 Adding tests and fixing inline parameter being converted to an attribute.
Fixes #265
2009-11-05 23:32:39 -05:00
mark_story
83845c6b1b Removing blank line. 2009-11-05 23:27:58 -05:00
mark_story
0c22175042 Updating doc blocks for CakeLog. 2009-11-05 23:25:08 -05:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
5506af8fcc Updating file headers.
Removing Object::$_log.  CakeLog is now called statically.  Saving an instance is not longer necessary or desired.
2009-11-05 23:21:40 -05:00
mark_story
c238d4d11b Adding return and test case for CakeLog::write() 2009-11-05 23:20:40 -05:00
mark_story
f414378bc7 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-11-05 22:03:38 -05:00
mark_story
781d184dbd Merge branch '1.3-logging' into 1.3-misc 2009-11-05 22:03:18 -05:00
predominant
490e76460f Changing quotes and adding spaces. Standarization cleanup. 2009-11-06 13:46:49 +11:00
mark_story
6b2f7f67a6 Removing whitespace. 2009-11-05 20:16:25 -05:00
mark_story
84c8cc3f36 Adding tests for importing loggers from app/libs and plugin/libs.
Adding tests for failed configs.
2009-11-05 20:13:15 -05:00
mark_story
54c772c5d5 Updating fileheader. 2009-11-05 19:49:12 -05:00
mark_story
b6ed3a9999 Updating doc block. 2009-11-05 19:45:04 -05:00
mark_story
6c9f215306 Adding tests for file log path settings. 2009-11-05 19:44:50 -05:00
mark_story
01bb9e5957 Refactoring FileLog
Adding test case for FileLog
2009-11-05 19:41:43 -05:00
mark_story
1e70119232 Adding basics to lib group, it wasn't part of any group before. 2009-11-05 19:20:35 -05:00
mark_story
afdcd36687 Fixing test broken by merge. 2009-11-05 19:18:38 -05:00