Commit graph

13763 commits

Author SHA1 Message Date
Florian Krämer
ca9ff0283c Refactoring View::element() 2012-07-04 11:48:10 +02:00
AD7six
90ae2df38e sort the mimeTypes map alphabetically
except for html which is at the top. Easier maintainance
2012-07-03 16:12:48 +02:00
AD7six
8a09b3d454 update mimetype map
References:

http://www.iana.org/assignments/media-types/application/index.html
http://www.iana.org/assignments/media-types/audio/index.html
https://github.com/h5bp/html5-boilerplate/blob/master/.htaccess#L86
2012-07-03 16:07:57 +02:00
Ceeram
4db909bd2d update version.txt to 2.3.0-dev 2012-07-02 12:19:00 +02:00
Jose Lorenzo Rodriguez
ec7ec73b66 Merge branch '2.1' into 2.2 2012-07-01 17:35:24 -04:30
mark_story
87677e4cdf Fix possible notice errors. 2012-06-26 23:31:22 -04:00
Alberto Leal
7d93c57bd3 Use the diff style provided by PHPUnit in the webrunner.
Displaying actual vs expected messages when the result is an array or string.
Fixes #GH-699
2012-06-26 19:53:49 -04:00
José Lorenzo Rodríguez
476209df03 Changing docs in CakeRequest:accepts() as they were misleading, you are required to pass a correct mimetype and not an alias 2012-06-26 14:38:07 -05:30
ADmad
93123a8e6f Change "create" to "edit" since said view and layout file already exist in app now. 2012-06-26 02:37:40 +05:30
ADmad
76f93178a8 Tweaked Validation::extension() 2012-06-25 19:15:52 +05:30
mark_story
ad5345887a Refactor tests.
Use generators to reduce some duplication.
2012-06-24 21:57:00 -04:00
mark_story
3f78216e96 Revert changes in behavior made to timeAgoInWords()
Changes made in [0729aca706] changed
the generated text to not match the behavior in 2.1.
2012-06-24 20:54:47 -04:00
mark_story
eb7b66b37c Revert default value of allowEmpty.
In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods.  Move some tests around and update tests that
probably should have been failing before.

Fixes #2983
2012-06-24 20:06:14 -04:00
ADmad
b2ccdd46e5 Fixed test failing when server's timezone is not UTC 2012-06-24 23:11:52 +05:30
mark_story
503bc06c70 Mark fixtures as created if they exist.
Fixes #2905
2012-06-24 12:57:54 -04:00
Juan Basso
ecdf0e6c6c Optimization for Hash method 2012-06-24 12:47:30 -04:00
mark_story
3e28326d9c Fix Controller::beforeRedirect() and array return.
Array return values from Controller::beforeRedirect() would be
incorrectly handled causing wrong URL's to be generated.

Fixes #2973
2012-06-24 12:03:31 -04:00
mark_story
35e0984bec Fix fatal error when E_STRICT is enabled.
If you have E_STRICT enabled and have a strict error in your files, you
would see a fatal error related to Debugger missing.  PHP won't autoload
classes if you are currently in an autoload call, and an error is
triggered.  Preloading Debugger + String in dev mode lets you see the
correct error.
2012-06-24 12:03:31 -04:00
Jelle Henkens
db7d5426ec CakeTime no longer sets the timezone out of its scope on the date object 2012-06-24 11:10:55 +01:00
mark_story
e2781a536a Fix whitespace error. 2012-06-23 21:03:15 -04:00
mark_story
5e54be4e5a Merge branch '2.1' into 2.2
Conflicts:
	lib/Cake/Error/exceptions.php
2012-06-23 16:41:32 -04:00
Ceeram
b913fe5303 better error message in MissingConnectionException when driver is not enabled 2012-06-23 11:42:26 +02:00
mark_story
13077a8f2f Add tests for previous commit. 2012-06-22 21:44:37 -04:00
Matt Hamann
a7ef245de5 Added 'helpers' to _applyConfig.
Allows default Helpers to be modified by EmailConfig setup.

Conflicts:

	lib/Cake/Network/Email/CakeEmail.php
2012-06-22 21:44:17 -04:00
mark_story
5c29c4d6e7 Merge branch '2.2-shell-command-sort' into 2.2
Closes #GH-695
2012-06-22 20:54:14 -04:00
mark_story
eb4056625d Re-add the sort option
Even though it does nothing, it should stick around as providing
it causes the shell to fail.
2012-06-22 20:53:53 -04:00
dogmatic69
058f48fc7b Showing the list of shells grouped by plugin
The option to sort has been removed and the list of shells is now
sorted and grouped by plugin and then by command.

Core and app shells are always listed last.
2012-06-22 20:53:44 -04:00
Ceeram
55f3cbe1f6 remove unneeded line 2012-06-22 14:44:47 +02:00
Ceeram
2f5f1b28bc Merge branch '2.2-validatorrules' into 2.2 2012-06-20 15:01:26 +02:00
Ceeram
71112d1225 No need to create new instance of ModelValidator when one is already created 2012-06-20 14:57:56 +02:00
Ceeram
60c611fa47 Parse rules in getField() 2012-06-20 14:54:32 +02:00
Jose Lorenzo Rodriguez
3908f0602c Update version number to 2.2.0-RC2 2012-06-19 21:02:39 -04:30
Jose Lorenzo Rodriguez
03d31b57f7 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-06-19 19:28:20 -04:30
Ceeram
cd209ce099 Avoid using LC_ALL, on some installs this would cause error:
"setlocale(): Specified locale name is too long"
2012-06-19 23:20:08 +02:00
Ceeram
03e2263b69 Merge branch '2.1' into 2.2 2012-06-19 18:35:36 +02:00
Ceeram
8b94d9e9e7 Only change locale for LC_NUMERIC instead of LC_ALL, on some installs this woudl cause an error:
"setlocale(): Specified locale name is too long"
2012-06-19 18:33:51 +02:00
Ceeram
cf18e8d38b avoid unneeded query in delete() 2012-06-19 16:08:36 +02:00
mark_story
89b2eddf0b Try regexp as not all locales are available. 2012-06-18 23:45:44 -04:00
mark_story
6a1e9e80b2 Try LC_ALL instead. 2012-06-18 23:31:10 -04:00
mark_story
81611956f5 Update doc blocks.
Add missing @throws
2012-06-18 23:29:28 -04:00
mark_story
77fc8a9d33 Switch to de_DE
nl_NL doesn't seem to exist on the ci server.
2012-06-18 23:25:42 -04:00
mark_story
001e89bf3f Fix formatting with locales using , as decimal separator
Fixes #2958
2012-06-18 23:13:09 -04:00
mark_story
f9ddc9c64c Move error disabling to the error controller. 2012-06-18 22:08:39 -04:00
mark_story
3c824b586f Use $this->bootstrap.
$this->boostrap makes the output match the file changed.
2012-06-18 21:38:08 -04:00
AD7six
d5cf2765dd remove referencers to fixtures that don't exist 2012-06-18 16:40:37 +02:00
AD7six
a6954a7abc Bark if a fixture file is missing
A missing fixture file would previously be silently ignored
2012-06-18 15:28:00 +02:00
Ceeram
0df1e90eed show all validation errors when saving/validating Associated and primary model fails validation as well, fixes #2925 2012-06-18 14:20:53 +02:00
mark_story
7ef83b89f5 Merge branch '2.1' into 2.2
h origin especially if it merges an updated upstream into a topic branch.
2012-06-17 20:54:59 -04:00
mark_story
fec6c1c6cb Fix security component causing black holes on error pages.
Fixes #2966
2012-06-17 20:50:00 -04:00
mark_story
54679023f9 Add support for DELETE + form encoded data.
Much like PUT, DELETE requests will automatically parse
form-urlencoded request bodies and set them as $this->data.
2012-06-17 20:03:45 -04:00