Commit graph

17761 commits

Author SHA1 Message Date
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
mark_story
c540e2b798 Merge branch 'master' into 2.6 2014-12-22 21:38:58 -05:00
euromark
0a974dd59f Adjust tests 2014-12-22 22:07:51 +01:00
euromark
14073dc742 Don't send response from view. 2014-12-22 21:02:52 +01:00
Mark Story
484b114e9b Merge pull request #5384 from okinaka/fix-mysql-describe
2.5: Fixing Mysql::describe() for timestamp.
2014-12-21 21:27:27 -05:00
Mark Story
84220c69d3 Merge pull request #4826 from rchavik/2.6-tree-options
Enable passing non-standard find options for Tree::getPath()
2014-12-20 07:54:35 -05:00
Rachman Chavik
45be270a7b Enable use of Containable with TreeBehaviors
This patch allows Containable use with:

- TreeBehavior::getParentNode()
- TreeBehavior::children()
- TreeBehavior::getPath()
2014-12-20 16:32:20 +07:00
Mark S.
92ae5f64f2 Merge pull request #5447 from ravage84/patch-2
Corrected/Improved DocBlock
2014-12-19 18:43:18 +01:00
Marc Würth
e778b5dce2 Corrected/Improved DocBlock 2014-12-19 18:20:48 +01:00
Mark Story
1651e7742c Merge pull request #5088 from sebastienbarre/ticket-5041
Ticket #5041: have Auth::login() send Auth.afterIdentify event
2014-12-18 00:12:22 -05:00
mark_story
4d6611b328 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
José Lorenzo Rodríguez
c496c7b857 Merge pull request #5422 from cakephp/fixture-bake
Don't quit bake when a table is missing.
2014-12-16 09:13:03 +01:00
Bryan Crowe
a2d495054e Update cakephp-codesniffer version 2014-12-15 23:46:22 -05:00
mark_story
2637d35543 Don't quit bake when a table is missing.
When a table is missing print a warning to stderr but don't exit. This
allows people to use `bake fixture all` with non-conventional tables.

Refs #5377
2014-12-15 21:28:55 -05:00
Mark Story
af8febf635 Merge pull request #5406 from cakephp/issue-5311
Handle exception when RequestHandler::startup() fails.

Refs #5311
2014-12-14 18:05:35 -05:00
mark_story
ae8a540101 Remove trailing whitespace. 2014-12-14 18:05:20 -05:00
mark_story
f19916bccf Add comments for possibly confusing code. 2014-12-13 22:25:52 -05:00
mark_story
c58e7da667 Handle exception when RequestHandler::startup() fails.
In the case that there is a request data type parser raises an
exception, or startup() otherwise fails the error page should be created
correctly. While I'm not able to write a test case for this, manual
testing confirmed the fix.

Refs #5311
2014-12-13 15:04:11 -05:00
OKINAKA Kenshin
8c008ad97d Update. 2014-12-11 13:55:41 +09:00
mark_story
cf108dbff3 Remove duplicate order key.
This was a mistake made in 4b6dba0.

Fixes #5376
2014-12-10 22:32:59 -05:00
mark_story
23c4b7b7d5 Fix whitespace. 2014-12-10 22:17:02 -05:00
Mark Story
2228afda0e Merge pull request #5334 from tranfuga25s/master
Change output to show the difference between fixture data and fields
2014-12-10 22:16:33 -05:00
OKINAKA Kenshin
5cff6aa746 Fixing Mysql::describe() for timestamp. 2014-12-11 10:31:19 +09:00
Mark Story
5c94eab799 Merge pull request #5365 from dereuromark/2.6-paginator
Merge the enabled and disabled options when creating prev/next buttons.

This removes the need for duplicating option values into the disabled attributes list.
2014-12-09 21:55:09 -05:00
mark_story
ac6d5cc70f Fix incorrect pluralization of Human.
Human should become humans, unlike other words ending in man.

Fixes #5370
2014-12-09 21:51:42 -05:00
Mark Story
1a1583a832 Merge pull request #5360 from ADmad/i18n-arabic
Fix plural calculation for Arabic
2014-12-09 12:54:02 -05:00
tranfuga25s
360346acd0 Added PHPCS fixes 2014-12-09 09:35:12 -03:00
tranfuga25s
674af51d6b Added PHPCS fixes 2014-12-09 09:16:34 -03:00
tranfuga25s
9ecdaf7965 Added PHPCS fixes and better array diff handling on fixture data count difference 2014-12-09 08:56:34 -03:00
Mark Story
0ce38029d0 Merge pull request #5362 from cakephp/master-sniff
Consolidate with conditions sniff.
2014-12-08 22:23:25 -05:00
euromark
1e6876b627 Fix tests 2014-12-09 03:43:35 +01:00
euromark
f63d955f73 Add additional test. 2014-12-09 03:43:35 +01:00