Commit graph

5607 commits

Author SHA1 Message Date
mark_story
326424592d Merge branch '1.2' into 1.2-merger
Conflicts:
	cake/VERSION.txt
	cake/config/config.php
	cake/dispatcher.php
	cake/libs/controller/scaffold.php
	cake/libs/inflector.php
	cake/libs/view/view.php
	cake/tests/cases/libs/controller/scaffold.test.php
	cake/tests/cases/libs/inflector.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/fixtures/counter_cache_post_fixture.php
	cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
mark_story
76f6e3dd07 Merge branch '1.3-numberhelper' into 1.3-misc 2009-09-11 21:07:30 -04:00
Niles
20fa1c9693 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-09-11 06:58:56 -04:00
Niles
b9970f7484 replace deprecated method calls. 2009-09-11 06:58:23 -04:00
mark_story
c49662e2ca Fixing deprecation error due to changes in API 2009-09-10 22:56:44 -04:00
mark_story
9c41efd6fe Adding NumberHelper::addFormat and test cases. Refs #5630 2009-09-10 22:54:49 -04:00
mark_story
818e7340f7 Adding test cases from #5630 2009-09-10 22:29:10 -04:00
mark_story
5f6015c3c4 Updating file headers and removing @static. 2009-09-10 22:23:48 -04:00
renan.saddam
4ec75c6052 Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc 2009-09-10 12:32:52 -03:00
renan.saddam
2e8bbd5eb1 Adding docblock for the new variable used for logging. Making the CakeLog::handleError logs the same output as in Debugger::handleError. 2009-09-10 12:32:21 -03:00
nate
fd6538fc72 Changes Model::find() to allow modification of DataSource connection during callbacks. 2009-09-10 09:28:55 -04:00
mark_story
4766f62029 Merge branch '1.3-logging' into 1.3-misc 2009-09-09 11:08:18 -04:00
mark_story
d0e6a79f82 Updating file headers.
Adding CakeLog::handleError which will log errors when debug = 0.
Test cases added.
2009-09-07 23:59:31 -04:00
mark_story
cac09481ac Removing support for DEBUG constant. Use Configure::write('debug', 2) instead.
Adding 'log' interaction to error reporting settings controlled by Configure::write().
2009-09-07 23:28:50 -04:00
mark_story
90b6272a14 Updating test case for new values in error reporting. 2009-09-07 22:53:08 -04:00
mark_story
11ceae2e96 Merge branch '1.3' into 1.3-logging 2009-09-07 22:41:31 -04:00
AD7six
e47316e74f Correcting App::import usage 2009-09-04 11:58:20 -07:00
mark_story
ce7864920f Adding ability to add arbitrary attributes to HtmlHelper::scriptBlock. Test case added. 2009-09-03 13:50:53 -04:00
mark_story
ead3b0ecf6 Allowing HtmlHelper::script() to take an array of options, allows for custom attributes to be added to script include tags. Test cases added. Fixes #2955 2009-09-03 13:45:39 -04:00
mark_story
c963d5cc43 Updating file headers. 2009-09-03 12:43:13 -04:00
mark_story
2ff5334347 Minor refactor to remove method calls to Inflector::camelize.
Adding tests to ensure references are maintained.
2009-09-03 09:37:25 -04:00
evilbloodydemon
75695341fa Helpers addressed by $this->Helper->func() 2009-09-03 00:58:26 -04:00
mark_story
1b063d6218 Reformatting code in CakeSession. 2009-09-01 23:25:03 -04:00
mark_story
c0a19ced14 Adding DboSource::getLog() and test case. 2009-09-01 23:23:47 -04:00
mark_story
4ff668b3ed Fixing method names that were omitted when methods were renamed. Thanks 'NetersLandreau' 2009-09-01 10:45:52 -04:00
Niles
26a4349e5a Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-09-01 10:43:00 -04:00
Niles
0614580c28 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-09-01 08:24:04 -04:00
mark_story
4d458e93b6 Updating SessionHelper::flash() to use elements for custom flash wrapping html instead of layouts. 2009-09-01 00:03:56 -04:00
mark_story
17e81ab346 Updating session component, to not use layout, and use elements instead.
Tests updated.
2009-08-31 23:59:40 -04:00
mark_story
1bedd8418b Merge branch '1.3-deprecation' into 1.3-misc 2009-08-31 23:41:41 -04:00
mark_story
3dc12cb6da Updating model tests to reflect deprecation of Model::bind() and Model::delete() aliases. 2009-08-31 23:40:47 -04:00
mark_story
9afa4d1c3a Updating test case to reflect API changes. 2009-08-31 22:52:15 -04:00
mark_story
4ee70c01a8 Updating tests to reflect API deprecations. 2009-08-31 22:50:46 -04:00
mark_story
b5605b6408 Updating file headers 2009-08-31 22:48:22 -04:00
mark_story
fe3514371f Updating folder + test case to reflect api changes. 2009-08-31 22:47:37 -04:00
mark_story
5fa6e5b6f2 Removing deprecated params. 2009-08-31 22:34:14 -04:00
mark_story
046d7c75d0 Adding warnings to newly deprecated methods. 2009-08-31 22:31:36 -04:00
mark_story
bd350e95b6 Deprecating Model::bind() 2009-08-31 22:18:31 -04:00
mark_story
71e93b9ae8 Fixing Scaffold not using session flashes even when they are available.
Simplifying message generation. Refs #64
2009-08-31 14:33:01 -04:00
mark_story
f6ce178d85 Simplifying message generation.
Fixing inflection of model names.
Adding tests for flash page generation. Refs #64
2009-08-31 14:24:50 -04:00
mark_story
0097e8c14b Updating Scaffold to merge hasAndBelongsToMany keys when generating field lists for scaffolded forms. Fixes #48 2009-08-31 14:22:37 -04:00
mark_story
84b230413a Fixing non output of flash messages from Scaffolds when controller is not using Sessions. Refs #64 2009-08-31 13:52:21 -04:00
mark_story
a678a603c0 Simplifying message generation.
Fixing inflection of model names.
Adding tests for flash page generation. Refs #64
2009-08-31 13:48:32 -04:00
mark_story
c0ba43c884 Fixing non output of flash messages from Scaffolds when controller is not using Sessions. Refs #64 2009-08-31 13:38:40 -04:00
Niles
dfc3cd2884 Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc 2009-08-31 10:38:12 -04:00
Niles
b8b382f8e7 add missing underscore to _decodeBody. 2009-08-31 10:36:31 -04:00
mark_story
9c82d19968 Adding tests for missingBehaviorClass and missingBehaviorError methods. 2009-08-30 19:38:17 -04:00
mark_story
81cb097959 Merge branch '1.3-behavior-error' into 1.3-misc 2009-08-30 19:33:43 -04:00
mark_story
c19c1a7828 Fixing issues with cakeError call.
Adding tests for cakeError being called with non-existant Behaviors.
2009-08-30 19:33:21 -04:00
mark_story
776992dc6c Further optimizations to path scanning. 2009-08-30 19:13:54 -04:00