mark_story
ecf7811b7a
Merge branch '2.0' into 2.0-request
...
Conflicts:
cake/dispatcher.php
cake/libs/controller/components/request_handler.php
cake/libs/view/helpers/form.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
2010-06-27 23:21:11 -04:00
mark_story
929bb5769e
Merge branch '1.3' into 2.0
...
Conflicts:
app/webroot/index.php
cake/console/templates/skel/webroot/index.php
cake/libs/cake_session.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/model_behavior.php
cake/libs/view/pages/home.ctp
cake/tests/cases/libs/controller/components/acl.test.php
cake/tests/cases/libs/file.test.php
2010-06-26 12:29:20 -04:00
predominant
83651091ce
Refactor session timeouts.
2010-06-24 10:30:12 +10:00
Juan Basso
9bbaf153f7
Setting cookies in a single line. Fixes #48
2010-06-23 00:10:21 -03:00
mark_story
5945edd983
Removing strtolower call that was breaking autolinks for URL shorteners. Tests added. Fixes #838
2010-06-21 21:17:37 -04:00
Juan Basso
26d20b6d62
Fixing wrap for html mode in e-mails. Fixes #663
2010-06-21 00:37:25 -03:00
Juan Basso
2a4489cdf2
Naming conventions to datasources with plugins. Fixes #819
2010-06-20 23:53:54 -03:00
mark_story
e14d8e5280
Updating test cases to work with JsBaseEngineHelper being abstract.
2010-06-20 22:31:24 -04:00
Thomas Ploch
2d20215e53
Converted JsBaseEngineHelper to an abstract class. Fixes #703 .
...
Signed-off-by: mark_story <mark@mark-story.com>
2010-06-20 22:21:21 -04:00
mark_story
0c8088c77d
Fixing parse error.
2010-06-20 22:17:47 -04:00
mark_story
a1911b4714
Changing array_key_exists for the faster isset().
2010-06-20 22:05:56 -04:00
mark_story
2db510d1c1
Modifying Controller::validateErrors so it can accept and validate arbitrary model objects, not just those attached to the controller. Test cases updated, fixes #832
2010-06-20 21:47:34 -04:00
mark_story
50144d6b5b
Making FormHelper clear fields on create() as well as end() this ensures that GET forms don't leak fields. Fixes #571
2010-06-12 22:50:09 -04:00
mark_story
d1651db9a8
Fixing typo in Scaffold that caused error messages to display incorrectly. Fixes #813
2010-06-11 10:01:02 -04:00
mark_story
df3432aa86
Updating doc blocks in ModelBehavior. Refs #810
2010-06-11 09:55:39 -04:00
mark_story
f0d755bd8e
Adding additional tests for Helper::_parseAttributes() and fixing issue where '1' would not be interpreted as a truthy value for compact attributes. Fixes #806
2010-06-10 19:11:26 -04:00
mark_story
e5df32e9d9
Adding omitted documentation information.
2010-06-10 14:23:49 -04:00
mark_story
ec5ad93a68
Updating doc blocks for ModelBehavior so they better reflect the actual behaviour of the methods.
...
Removing unused variable assignment.
Fixes #810
2010-06-10 13:54:04 -04:00
mark_story
9ee4a12a9d
Adding additional tests for FormHelper::input() and checkbox generation and checked attribute being set for truthy values. Close #806
2010-06-10 12:48:55 -04:00
Juan Basso
d5ddd8ee5f
Fixing check of EHLO/HELO in EmailComponent. Fixes #794
2010-06-09 19:22:06 -03:00
mark_story
ad8b70cec2
Removing continue statement that did nothing.
...
Adding a rollback for when validation fails and atomic has been set.
Tests added. Fixes #797
2010-06-09 13:48:54 -04:00
mark_story
bca3c4ab38
Moving init() tests into separate test methods.
...
Adding tests for table prefixes on models being used as imports.
Fixing issue where tablePrefix was not accurately used when importing model information. Fixes #765
2010-06-08 23:30:57 -04:00
mark_story
2f527cc5af
Adding a few tests for DboSource::fullTableName();
2010-06-08 23:29:40 -04:00
mark_story
a88b8dd5b9
Making requestAction() calls that requesthandler creates not remove autoLayout. This fixes issues where ajax layout files would not be rendered.
...
Tests added. Fixes #722
2010-06-07 23:43:35 -04:00
Kyle Robinson Young
a9fa7ac240
Fix for auth component userModel with plugins. Fixes #799
2010-06-07 23:19:13 -04:00
mark_story
ccd036eed0
Adding additional test cases for nld, dut, and nl. Closes #795
2010-06-07 23:10:53 -04:00
mark_story
94fc492623
Correcting how ExtractTask collects files. Test added. Fixes #775
2010-06-06 22:39:04 -04:00
predominant
0eea0ce0f8
Updating version numbers to 1.3.2
2010-06-07 02:21:51 +10:00
predominant
e47c9660f9
Remove debugging.
2010-06-07 02:03:41 +10:00
predominant
d803b30388
Fix Model validation bake tests for Windows.
2010-06-07 01:39:24 +10:00
predominant
26d526f624
Fix AuthComponent tests for windows newlines.
2010-06-07 01:22:08 +10:00
mark_story
e41e89cd2a
Making magic select not override magic hidden. Tests added.
...
Fixes #782
2010-06-04 00:20:14 -04:00
mark_story
bd6e16be26
Fixing issue where join tables would be filed under 'missing' and found. Test added. Fixes #789
2010-06-03 23:20:37 -04:00
Juan Basso
3c27c4c41e
Ajusting smtpOption in EmailComponent. Fixes #779
2010-06-03 14:46:20 -03:00
Juan Basso
b480d80c82
Avoid undefined index if not define timeout in EmailComponent. Fixes #779
2010-06-02 18:14:58 -03:00
mark_story
7682c5896e
Changing how merged rules are cleared so it doesn't generated notice errors in PHP4. Test added. Fixes #762
2010-06-01 23:41:51 -04:00
mark_story
8d8fce4429
Fixing template task path replacements under windows. Fixes #771
2010-05-31 21:26:55 -04:00
Juan Basso
74dad04323
Fixing read from SMTP by EmailComponent. Closes #772
2010-05-30 23:29:21 -03:00
mark_story
7ed67e5959
Fixing virtualFields used in order clauses where virtualField was supplied with model alias. Tests added. Refs #768
2010-05-30 20:30:58 -04:00
mark_story
c98a82c61c
Fixing whitespace.
2010-05-30 20:28:00 -04:00
mark_story
66a8890f4f
Fixing code formatting in test cases.
2010-05-30 12:51:48 -04:00
mark_story
07948a733d
Reverting change made in [ 7cde309
]. Readding trim() to fix issues on windows. Updating tests so they continue to pass on macos. Fixes #769
2010-05-30 11:16:40 -04:00
predominant
907af961c8
Merge remote branch 'origin/1.3' into 1.3
2010-05-30 14:31:28 +10:00
predominant
9cd73c345e
Update short description doc blocks.
2010-05-30 14:29:32 +10:00
mark_story
0180daaad3
Updating version numbers to 1.3.1
2010-05-29 13:26:34 -04:00
mark_story
dea33f6452
Fixing pass by reference errors in php5.3. Fixes #451
2010-05-29 13:19:12 -04:00
mark_story
7cde3094f0
Removing trim() that was performed when reading a file with a lock() enabled. This was causing a failure in php5.
2010-05-29 12:50:42 -04:00
mark_story
25a6a3cac8
Correcting spacing in file test.
...
Correctly constructing a File object, so testRead does not rely on the previous test to leave the object in the correct state.
2010-05-29 12:47:31 -04:00
renan.saddam
c96d074722
Merge branch '1.3' of github.com:cakephp/cakephp into 1.3
2010-05-29 12:23:04 -03:00
renan.saddam
8f5112b8d7
Changing break; to continue; so it will process the next tables on the array, tests added.
2010-05-29 12:22:16 -03:00