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
|
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
|
7bbc3dfd90
|
Merge pull request #5470 from cakephp/2.7-session
Backport Session consume() to 2.x
|
2014-12-26 12:22:20 -05:00 |
|
Mark S.
|
c7940f57ac
|
Merge pull request #5469 from cakephp/2.7-configure
Backport Configure::consume() to 2.x
|
2014-12-25 22:23:44 +01:00 |
|
Edgaras Janušauskas
|
3ae61e9e16
|
Fix Extract task to correctly extract messages with context
|
2014-12-25 14:28:44 +02:00 |
|
mark_story
|
eba6105a52
|
Merge branch '2.7' of github.com:cakephp/cakephp into 2.7
Conflicts:
lib/Cake/TestSuite/ControllerTestCase.php
|
2014-12-23 11:30:29 -05:00 |
|
mark_story
|
d21ae178bf
|
Merge branch 'master' into 2.7
Conflicts:
lib/Cake/VERSION.txt
|
2014-12-23 11:29:57 -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 |
|
euromark
|
53f1390b7d
|
Backport array support for testAction()
|
2014-12-23 13:42:21 +01:00 |
|
euromark
|
5c5fb59c8d
|
Allow apps to overwrite translation domains from third party plugins.
|
2014-12-23 13:09:53 +01:00 |
|
mark_story
|
6db96d5e41
|
Merge branch '2.6' into 2.7
|
2014-12-22 21:39:08 -05:00 |
|
euromark
|
813925abee
|
Backport Session consume()
|
2014-12-23 03:39:05 +01:00 |
|
mark_story
|
c540e2b798
|
Merge branch 'master' into 2.6
|
2014-12-22 21:38:58 -05:00 |
|
euromark
|
5af24bdb31
|
Correct array syntax.
|
2014-12-23 03:29:52 +01:00 |
|
euromark
|
515302528d
|
Backport Configure::consume() to 2.x
|
2014-12-23 03:26:03 +01:00 |
|
euromark
|
0a974dd59f
|
Adjust tests
|
2014-12-22 22:07:51 +01: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 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
|
839ef73d43
|
Merge branch '2.6' into 2.7
|
2014-12-17 21:46:54 -05:00 |
|
mark_story
|
4d6611b328
|
Merge branch 'master' into 2.6
Conflicts:
lib/Cake/VERSION.txt
|
2014-12-17 21:38:32 -05:00 |
|
Walther Lalk
|
9be725613e
|
Backport helper method for view blocks from 3.0
Related PR is #5385
|
2014-12-11 16:44:11 +02:00 |
|
OKINAKA Kenshin
|
8c008ad97d
|
Update.
|
2014-12-11 13:55:41 +09:00 |
|
OKINAKA Kenshin
|
5cff6aa746
|
Fixing Mysql::describe() for timestamp.
|
2014-12-11 10:31:19 +09: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 |
|
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 |
|
euromark
|
dc41a1ff56
|
Fix paginator options when disabled.
|
2014-12-09 03:43:34 +01:00 |
|
euromark
|
e1c128bb99
|
Consolidate with conditions sniff.
|
2014-12-09 03:17:35 +01:00 |
|
ADmad
|
850edf47a0
|
Fix plural calculation for Arabic.
Refs #5348
|
2014-12-08 23:58:27 +05:30 |
|
mark_story
|
c32e165052
|
Merge branch '2.6' into 2.7
|
2014-12-06 21:29:13 -05:00 |
|
mark_story
|
ad2d6edda9
|
Merge branch 'master' into 2.6
|
2014-12-06 21:28:59 -05:00 |
|
euromark
|
11981f80fa
|
Correct doc block.
|
2014-12-06 04:54:22 +01:00 |
|
mark_story
|
bbfe3170dc
|
Fix incorrect hardcoded database name.
|
2014-12-01 23:03:47 -05:00 |
|
Guy Warner
|
327fcb4846
|
Fix some missed doc block issues
|
2014-11-30 14:50:11 -07:00 |
|
Guy Warner
|
fb61d9393b
|
Add @trigger doc blocks of methods triggering CakeEvent
|
2014-11-30 14:45:40 -07:00 |
|
mark_story
|
1c913d29b6
|
Merge branch '2.6' into 2.7
|
2014-11-29 22:00:24 -05:00 |
|
mark_story
|
543f05e3d0
|
Merge branch 'master' into 2.6
|
2014-11-29 22:00:00 -05:00 |
|
Florian Krämer
|
43f7fcc735
|
Adding a few more ways to detect HTTP headers, extensions and the accept header.
|
2014-11-27 01:00:44 +01:00 |
|
euromark
|
d0f75a03af
|
Allow RLIKE in conditions.
|
2014-11-26 19:56:58 +01:00 |
|
mark_story
|
1e6d22b8cb
|
Make the version option function as intended.
The version option is documented but does not work. While this 'breaks'
behavior, it also fixes what I think is a more important issue.
Refs #5234
|
2014-11-24 22:38:00 -05:00 |
|
Sebastien Barre
|
20e2882bf6
|
Remove duplicate class declaration
|
2014-11-23 21:49:29 -05:00 |
|
Sebastien Barre
|
5ac47487f9
|
Merge branch 'ticket-5041' of github.com:sebastienbarre/cakephp into ticket-5041
Conflicts:
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
|
2014-11-22 13:38:11 -05:00 |
|
Sebastien Barre
|
a2e7896038
|
Fix uses, style
|
2014-11-22 13:31:39 -05:00 |
|
Sebastien Barre
|
7da48669c8
|
Have BaseAuthenticate implement CakeEventListener instead
|
2014-11-22 13:31:38 -05:00 |
|
Sebastien Barre
|
50e5b5e8fe
|
Move App::uses() again
|
2014-11-22 13:31:38 -05:00 |
|
Sebastien Barre
|
d7b353dcf9
|
Move App::uses(), rename helper class to avoid conflict
|
2014-11-22 13:31:38 -05:00 |
|
Sebastien Barre
|
43413f029e
|
Ticket 5041: have Auth::login() send Auth.afterIdentify event
|
2014-11-22 13:31:38 -05:00 |
|
Florian Krämer
|
4ff07b745a
|
Adding a test for the new json and xml detectors that were added to the CakeRequest class.
|
2014-11-22 17:30:53 +01:00 |
|