mark_story
ea9eee4c77
Fix array arguments being translated.
...
Fixes #2902
2012-05-23 21:02:41 -04:00
José Lorenzo Rodríguez
33eb46cd87
Merge pull request #666 from boast/patch-1
...
Fixed XmlArticle and XmlUser Models associations.
2012-05-22 21:41:04 -07:00
David Thalmann
81fedbba9c
Fixed XmlArticle and XmlUser Models associations. Fixes failing testWithModel
test and does no longer try to use the 'default' datasource.
2012-05-23 07:19:06 +03:00
mark_story
f414aae5d7
Update version number to 2.2.0-RC1
2012-05-22 21:43:17 -04:00
mark_story
d6bf61cb36
Merge branch '2.1' into 2.2
2012-05-22 21:27:05 -04:00
mark_story
661feb8a1f
Create signed tags.
2012-05-22 21:26:40 -04:00
mark_story
a393b20931
Add some doc blocks.
2012-05-22 21:14:26 -04:00
José Lorenzo Rodríguez
ed15634ccb
Merge pull request #663 from jellehenkens/api-docs-mixed-params
...
Updating @param mixed docblock lines to proper multi type @param's
2012-05-22 08:38:23 -07:00
Jelle Henkens
ecd869d4e3
Changing int to integer
2012-05-22 16:34:07 +01:00
mark_story
0ed6752110
Fix coding standards.
2012-05-21 20:29:00 -04:00
Norio Suzuki
f816f6ae1b
Supported japanese legacy charset and changed to use upper case charset in Content-Type line
2012-05-21 20:28:59 -04:00
Mark Story
b0049921a4
Merge pull request #664 from tigrang/inputDefaults-setter
...
Making FormHelper::inputDefaults() code more readable
2012-05-21 15:06:45 -07:00
Tigran Gabrielyan
671c31218f
Making FormHelper::inputDefaults() code more readable
2012-05-21 13:56:51 -07:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
ADmad
e58e3c5314
Fix regex for failing test on 5.2
2012-05-21 19:48:47 +05:30
Mark Story
4fd45c07f5
Merge pull request #660 from jellehenkens/2.2-http-socket-duplicate-code
...
Removing an unnecessary if statement in HttpSocket
2012-05-20 18:02:40 -07:00
José Lorenzo Rodríguez
bb368c569c
Merge pull request #659 from tigrang/inputDefaults-setter
...
Input defaults setter for FormHelper
2012-05-20 16:40:20 -07:00
Jose Lorenzo Rodriguez
9cceb1553f
Improving ModelValidator::add() to allow multiple rules to be defined at once
2012-05-20 18:51:00 -04:30
Tigran Gabrielyan
57ad5e2573
Made FormHelper::inputDefaults() alawys return inputDefaults array
2012-05-20 15:51:48 -07:00
Jelle Henkens
327f809016
Removing duplicate if statement
2012-05-20 23:12:50 +01:00
ADmad
cfd9d8a815
Added CakeTime::listIdentifiers()
2012-05-21 03:05:42 +05:30
Tigran Gabrielyan
fd0dd7ec04
Updating FormHelper::create to use new inputDefaults() method
2012-05-20 13:44:54 -07:00
Tigran Gabrielyan
1d77ad393c
Added FormHelper::inputDefaults setter/getter method
2012-05-20 13:41:55 -07:00
mark_story
024e30eb42
Fix coding standards errors.
...
Adding a private property allows fixing of 4 naming standards
errors.
2012-05-20 16:06:41 -04:00
mark_story
16a1a0ee79
Fix coding standards.
2012-05-20 15:51:09 -04:00
Jose Lorenzo Rodriguez
2ad406ab64
Merge branch '2.2-validator' into 2.2
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
2012-05-20 14:27:35 -04:30
mark_story
ad31caeb0e
Merge branch '2.1' into 2.2
2012-05-20 14:53:41 -04:00
Mark Story
94a58bd35d
Merge pull request #657 from shama/patch-phpunit
...
Update PHPUnit install instructions
2012-05-20 09:09:33 -07:00
Kyle Robinson Young
3f7cbf561b
Update PHPUnit install instructions
2012-05-19 22:06:45 -07:00
Jose Lorenzo Rodriguez
16847b0d97
Backporting changes form 2.2 to fix some edge cases on deep saving. Fixes #2879
2012-05-19 21:14:23 -04:30
Jose Lorenzo Rodriguez
dc8c731ccb
Fixed failing test case
2012-05-19 19:59:32 -04:30
Jose Lorenzo Rodriguez
b22c50d8b6
Merge branch '2.1' into 2.2-validator
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Model/ModelValidationTest.php
lib/Cake/Test/Case/Model/models.php
2012-05-19 15:39:44 -04:30
Ceeram
7dbd6bc3a2
make sure model data is moved to alias, even when first key in data is assoc model
...
add extra tests for saveAll and validate first
ensure db values dont get reset to default values
2012-05-19 14:41:16 -04:30
Mark Story
df684ca9fe
Merge pull request #656 from jellehenkens/2.2-coding-conventions
...
Fixing code conventions
2012-05-19 08:56:02 -07:00
mark_story
7107cd6631
Fix fatal error when checking for PHPUnit.
...
Doubly including PHPUnit/Autoload.php causes fatal errors.
Having access to one of the PHPUnit classes means phpunit exists as
well.
Fixes #2890
2012-05-19 11:35:55 -04:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
ADmad
d5b5327f70
Merge pull request #653 from jellehenkens/2.2-cake-time-date-time-objects
...
Support for DateTime objects in the CakeTime Utility class
2012-05-17 11:55:56 -07:00
Jelle Henkens
5fe22cfc8d
Adding support for DateTime objects in the CakeTime Utility class
2012-05-17 19:31:30 +01:00
Rachman Chavik
f89bc6503a
CakeTime::format crashed when timezone is passed
2012-05-17 19:05:45 +07:00
mark_story
4dc07b6d39
Merge branch '2.1' into 2.2
2012-05-16 21:08:06 -04:00
mark_story
c6258fa68c
HTML escape context variables.
...
When creating HTML or js errors the context should be
escaped, as it is very possible that the context vars will contain
HTML.
Clean up some internals in Debugger::outputError(). There were
a few duplicate data structures, and $$ variables.
Fixes #2884
2012-05-16 21:07:45 -04:00
Mark Story
fd216c4dda
Merge pull request #655 from jellehenkens/2.2-app-dir-tests
...
Updating CakeSchema test case to test non standard app folder names
2012-05-16 09:52:17 -07:00
Rachman Chavik
c9b801b96d
making CakeLog to work with bogus $type and $scope
...
closes #2881
2012-05-16 08:16:20 +07:00
mark_story
a37bdba8fe
Revert accidental change.
2012-05-15 21:07:43 -04:00
mark_story
7d9f441020
Add documentation.
2012-05-15 21:00:18 -04:00
Jelle Henkens
110536d575
Fixing CakeSchema to test APP_DIR with different names than all lowercase
2012-05-15 21:41:11 +01:00
mark_story
0faaedfff5
Split up tests.
...
Fix API usage in tests.
2012-05-14 21:32:31 -04:00
mark_story
cbd6cafed7
The event manager should be re-used.
...
View::__construct() gets the controller's event manager,
only to override it the first time getEventManager() is called.
Don't overwrite the Controller's event manager as it allows plugins
to more easily hook into the view process.
2012-05-14 21:18:09 -04:00
Rachman Chavik
6bb29ea03b
changing CakeLog::_autoConfig for better bc
...
closes #2880
2012-05-15 08:16:55 +07:00
Mark Story
405aacc0fc
Merge pull request #654 from jellehenkens/2.2-schema-shell-test
...
Fixing test assert for APP_DIR scenarios with non standard folder names
2012-05-13 17:30:30 -07:00