Commit graph

17742 commits

Author SHA1 Message Date
Mark Story
1fee3c030e Merge pull request #5616 from cakephp/issue-5603
Fix radio buttons not being added to security hash.
2015-01-09 15:32:44 -05:00
mark_story
03d8c40d99 Fix PHPCS error. 2015-01-09 15:32:33 -05:00
mark_story
18f02bf5b3 Don't emit errors or trigger exceptions when headers have been sent.
After discussing it a bit, we've come to consensus that emitting errors
or throwing exceptions are both pretty disruptive and annoying to deal
with. Instead we'll revert to the previous 2.x behavior of doing
nothing.
2015-01-09 15:16:14 -05:00
ADmad
e3b48cdf6f Merge pull request #5617 from antograssiot/master
Replace our custom code fence with markdown standard fence.
2015-01-09 22:53:43 +05:30
antograssiot
c2f298a8b7 Replace our custom code fence with markdown standard fence 2015-01-09 13:47:25 +01:00
mark_story
98909fb465 Fix radio buttons not being added to security hash.
When some but not all inputs were disabled radio buttons were omitted
from the security hash. This caused blackhole failures as the input was
unexpected.

Refs #5603
2015-01-08 23:25:34 -05:00
mark_story
a7aaa93131 Convert header_sent exception into a notice error.
Throwing an exception here, causes an infinite loop when handling fatal
errors, as the shutdown function sends headers automatically.

Refs #5595
2015-01-08 21:47:13 -05:00
José Lorenzo Rodríguez
642e11e728 Merge pull request #5610 from dmromanov/patch-2
Fix double encoding time strings (CakeTime)
2015-01-08 22:46:27 +01:00
dmromanov
eb414bdda1 Fix double encoding time strings (CakeTime)
Fix time strings being double encoded when mb_string is not installed.
2015-01-09 00:03:49 +03:00
Mark Story
2ee5c3d73d Merge pull request #5590 from bcrowe/criteria
Correct criterion inflection
2015-01-06 23:11:00 -05:00
Bryan Crowe
66a0e6226d Correct criterion inflection 2015-01-06 23:03:53 -05:00
Mark Story
d21b046fc8 Merge pull request #5582 from cakephp/master-hotfix-string-wrap
Stop goofy formatting when newlines are present already.
2015-01-06 12:04:54 -05:00
euromark
389f745d16 Stop goofy formatting when newlines are present already. 2015-01-06 13:13:33 +01:00
José Lorenzo Rodríguez
f6975f5254 Merge pull request #5572 from cakephp/issue-5570
Improve error used when a cache configuation fails to start.
2015-01-05 10:15:35 +01:00
mark_story
d7bc73b1e3 Improve error used when a cache configuation fails to start.
Refs #5570
2015-01-04 19:54:58 -05:00
Mark Story
49b9d2c865 Merge pull request #5566 from hakito/patch-1
Avoid connection to default for mocked models

Fixes #5565
2015-01-04 17:48:02 -05:00
Gerd Katzenbeisser
bf3ff8e2ad Avoid connection to default for mocked models
Fixes #5565
2015-01-04 16:53:00 +01:00
euromark
dabf55785f Simplify test assert. 2015-01-04 02:30:11 +01:00
mark_story
9553c029c4 Merge branch 'autolink-brackets' into master
Fixes #5544
2015-01-03 14:34:30 -05:00
mark_story
b6029d7ad1 Add some additional tests for autoLink.
Refs #5544
2015-01-03 14:30:56 -05:00
Mark Story
0a4cffc603 Merge pull request #5501 from cakephp/2.6-hotfix-session-tmp-dir
Also autocreate session folder in debug mode
2015-01-02 11:36:53 -05:00
Rob McVey
76b7c8c594 More complex test case for GET params 2015-01-02 15:31:27 +00:00
Rob McVey
54e172b129 Regex modified to to not capture brackets
Modified the existing regex from th TLD onwards

Credit to @gruber for the regex info
https://gist.github.com/gruber/249502
2015-01-02 15:15:23 +00:00
Rob McVey
2bf41f3d85 Add missing double quote to link in test 2015-01-02 15:09:40 +00:00
Rob McVey
1ebcd9bf72 Test brackets are not autolinked inside href tag 2015-01-02 15:08:21 +00:00
José Lorenzo Rodríguez
fcb6520ef1 Merge pull request #5513 from cakephp/issue-4916
Don't set content-length when serving assets.
2014-12-30 10:12:19 +01:00
mark_story
a65354225e Don't set content-length when serving assets.
Setting content-length on assets causes long pauses when fetching assets
that contain PHP code. These assets are invariably larger than their
response bodies. By not setting a content-length, we can allow the
webserver to calculate it for us.

Refs #4916
2014-12-29 21:07:46 -05:00
José Lorenzo Rodríguez
5f59b4bb0d Merge pull request #5510 from cakephp/issue-5506
Fix length reflection in SQLServer
2014-12-29 23:10:33 +01:00
mark_story
ec57fb4579 Fix length reflection in SQLServer
Don't reflect TEXT column lengths in SQLServer. Because SQLServer text
columns hold ~2GB of data there is no meaningful length to them.

Refs #5506
2014-12-29 16:47:50 -05:00
euromark
5aff618109 Also autocreate session folder in debug mode 2014-12-27 20:34:47 +01:00
ADmad
843ddd6d36 Merge pull request #5423 from bcrowe/sniffer
Update cakephp-codesniffer version
2014-12-28 00:35:15 +05:30
José Lorenzo Rodríguez
8a4b0e8754 Merge pull request #5478 from tranfuga25s/HtmlCodeCoverageFix
Html Testing Renderer & Code Coverage Improvement
2014-12-27 00:09:01 +01:00
Esteban
fe3d2b938c Added conditional to do not show rerun link if is warning of no test present
CS Fix

Update CakeHtmlReporter.php

Removed spaces in array return
2014-12-26 15:50:25 -03:00
Esteban
21f3a51ebc Rerun only one test option adding
Changed scope of function and fix CS problem
2014-12-26 15:50:23 -03:00
Esteban
58eb7b80ab Added All options enabled when running test from webfrontend
Fix failing test

Fix CS problem with new code

Fix test for code coverage generator

Fix tests

Fix CS Errors

Removed spaces in tabulation
2014-12-26 15:49:42 -03:00
Mark Story
11206d548c Merge pull request #5490 from garas/2.6-i18n-ExtractTask-context
Fix Extract task to correctly extract messages with context
2014-12-25 08:20:20 -05:00
Edgaras Janušauskas
3ae61e9e16 Fix Extract task to correctly extract messages with context 2014-12-25 14:28:44 +02:00
Esteban
b7510d4883 Avoids problem with code coverage switch when are to equaly named files in a test 2014-12-23 17:23:12 -03:00
Esteban Zeller
aaf65df266 Merge pull request #1 from cakephp/master
Update to the new version of CakePHP
2014-12-23 17:17:58 -03:00
mark_story
02ca7f5fcb Update version number to 2.6.0 2014-12-23 11:26:27 -05:00
mark_story
f4b682d384 Revert version number.
I forgot to merge a few pull requests before releasing.
2014-12-23 11:25:54 -05:00
Mark Story
033d968766 Merge pull request #5468 from dereuromark/2.6-i18n
Allow apps to overwrite translation domains from third party plugins.
2014-12-23 11:25:10 -05:00
Mark Story
96c458f300 Merge pull request #5467 from cakephp/2.6-mediaview
Don't send response from view.
2014-12-23 11:24:47 -05:00
mark_story
8de2877573 Update version number to 2.6.0 2014-12-23 11:22:20 -05:00
mark_story
10717d9248 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-12-23 11:22:00 -05:00
mark_story
667e2be2d2 Update version number to 2.5.8 2014-12-23 11:21:16 -05:00
mark_story
5cf5fe53ee Clarify question.
Fixes #1870
2014-12-23 11:18:32 -05:00
Mark Story
8382ecb689 Merge pull request #5474 from cakephp/master-testsuite
Correct argument. Should not have a default string.
2014-12-23 09:50:18 -05:00
euromark
22a4a2f5de Correct argument. Should not have a default string. 2014-12-23 15:36:25 +01:00
euromark
5c5fb59c8d Allow apps to overwrite translation domains from third party plugins. 2014-12-23 13:09:53 +01:00