Commit graph

3544 commits

Author SHA1 Message Date
mark_story
50bd279018 Merge branch '1.3-auth' into 1.3 2009-09-20 17:53:23 -04:00
mark_story
e6cc81226d Merge branch '1.3-jshelper' into 1.3 2009-09-20 17:46:30 -04:00
mark_story
d5376e64aa Adding patch from 'Ceeram' and 'TehTreag' to implement automatic updating of Aro/Aco nodes created AclBehavior. Test cases added. Fixes #33 and #4261 2009-09-19 01:17:20 -04:00
mark_story
05f908d36d Fixing failing tests in JsHelper caused by changed API in HtmlHelper. 2009-09-16 01:55:15 -04:00
mark_story
5717e3b59c Merge branch '1.2' into 1.2-merger
Conflicts:
	app/webroot/test.php
	cake/VERSION.txt
	cake/bootstrap.php
	cake/config/config.php
	cake/console/cake.php
	cake/console/libs/schema.php
	cake/console/templates/skel/webroot/test.php
	cake/libs/configure.php
	cake/tests/cases/console/libs/schema.test.php
	cake/tests/cases/libs/debugger.test.php
	cake/tests/cases/libs/model/model_write.test.php
	cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
mark_story
793c6ec07a Making DboSybase able to return VIEW's as part of listSources(), making it similar to DboPostgres and DboMysql. Fixes #91 2009-09-15 22:00:49 -04:00
mark_story
2c633912e0 Making DboSybase able to return VIEW's as part of listSources(), making it similar to DboPostgres and DboMysql. Fixes #91 2009-09-15 22:00:04 -04:00
mark_story
f764c53c55 Removing Inflector's inheritance on Object, as it was unecessary.
Adding irregular waves => wave missed in merge from 1.2
2009-09-15 21:44:27 -04:00
mark_story
3ef53aa159 Applying optimization from 'wangbo' to View::renderCache(). Fixes #26 2009-09-14 23:56:50 -04:00
mark_story
f1194a4ec9 Commiting fix to pass tests in last commit.
Making View::renderCache tests more specific.
2009-09-14 23:53:04 -04:00
mark_story
01cf40bf12 Adding automatic use of $options for $disabledOptions in PaginatorHelper::next() and PaginatorHelper::prev(). Thanks to 'joaquin_win' for the initial patch. Refs #83 2009-09-14 23:06:24 -04:00
mark_story
4a6412fb27 Adding tests for AuthComponent::action().
Adding plugin support for AuthComponent in actions mode.  Refs #33
2009-09-14 00:29:33 -04:00
mark_story
090eb27be1 Updating imports in AuthComponent and AuthComponent test case. 2009-09-13 23:42:25 -04:00
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
9c41efd6fe Adding NumberHelper::addFormat and test cases. Refs #5630 2009-09-10 22:54:49 -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
mark_story
0065005f95 Fixing custom error class not being used if error for field is a named index. Test case added. Fixes #76 2009-09-10 09:57:23 -04: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
jperras
5a432c6f71 Applying fix from Ceeram for updateAll joins on model relations with no foreign key. Fixes #69. 2009-09-09 00:00:53 -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
12e0652943 Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2 2009-09-07 14:47:53 -04:00
nate
a5c00de3bd Applying PHP 5.3 compatibility patch from. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly. 2009-09-07 14:25:22 -04:00
jperras
daadac03cc Merge branch 'bug-22-schema-shell' into 1.2 2009-09-07 12:34:12 -04:00
jperras
24351b5a21 Backporting bugfix for #22 from 1.3-console to 1.2. Adds schema shell test cases, fixes for schema object references, i18n of schema schell output strings. 2009-09-07 12:24:38 -04:00
jperras
4dc656fd91 Updating EmailComponent smtp HELO handling to account for non-existence of HTTP_HOST environment variable when PHP SAPI is CLI. Fixes #41. 2009-09-07 11:18:11 -04:00
jperras
2484179e36 DboMssql::value() now returns NULL for numeric column types (float, integer, binary) when the column data is empty. Fixes #28. 2009-09-06 13:57:24 -04:00
mark_story
bcbdb1cf1d Fixing issue where admin revere routing was possibly unsuccessful due to differences in action param between route and url arrays. Fixes #44 and #6173 2009-09-05 01:06:18 -04:00
mark_story
4f4411126c Fixing empty arrays being dropped with Set::sort(). Fixed #67 2009-09-03 23:09:27 -04:00
mark_story
b5a38d69a5 Merge branch '1.2-dirty' into 1.2 2009-09-03 22:47:45 -04:00
mark_story
cf3521737f Fixing selected with interval not selecting the correct option. Fixes #70. 2009-09-03 22:47:17 -04: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
renan.saddam
0e9007e060 Making sure we are not making non-uniques and non-primary keys index. Also changing basic fixture schema to make tests pass. 2009-09-02 22:07:58 -03: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
fb476f17cc Fixing Set::extract run against hasMany records that are the result of a find('first'). Test case added. 2009-09-01 13:18:20 -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
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