mark_story
|
13f147940f
|
Correct inflection of virus.
Instead of viri, it should be viruses.
Refs #7466
|
2015-09-28 21:04:23 -04:00 |
|
Mark Story
|
5a8a7800ae
|
Merge pull request #7469 from cakephp/issue-7465
Load config file before checking class existence.
|
2015-09-28 15:43:53 -04:00 |
|
ADmad
|
c3e08fde30
|
Load config file before checking class existence.
Closes #7465
|
2015-09-28 22:52:51 +05:30 |
|
Mark Story
|
dad9eaab90
|
Merge pull request #7463 from cakephp/ADmad-patch-1
Update debugkit links to 2.x compatible branch
|
2015-09-28 12:32:48 -04:00 |
|
José Lorenzo Rodríguez
|
8e82993904
|
Merge pull request #7464 from ravage84/2.7-debugkit-link
Link to DebugKit 2.2 branch
|
2015-09-28 14:18:13 +02:00 |
|
Marc Würth
|
26a05a4e87
|
Update another link to DebugKit 2.2 branch
|
2015-09-28 12:51:30 +02:00 |
|
Marc Würth
|
7b20c804f4
|
Use caret operator for depending on DebugKit
|
2015-09-28 12:48:40 +02:00 |
|
Marc Würth
|
2d82a120af
|
CS
|
2015-09-28 12:47:25 +02:00 |
|
Marc Würth
|
f1160b7401
|
Update link to DebugKit 2.2 branch
Refs https://github.com/cakephp/debug_kit/issues/372
|
2015-09-28 12:47:14 +02:00 |
|
ADmad
|
ab7e8f8491
|
Update debugkit links to 2.x compatible branch
Refs cakephp/debug_kit#372
|
2015-09-28 09:48:50 +05:30 |
|
mark_story
|
ae83e197dc
|
Merge branch '2.8' of github.com:cakephp/cakephp into 2.8
|
2015-09-27 11:13:12 -04:00 |
|
mark_story
|
8a57d78dba
|
Merge branch '2.7' into 2.8
|
2015-09-27 11:12:55 -04:00 |
|
Mark Story
|
0da9c4976d
|
Merge pull request #7448 from ravage84/2.7-tests-improved
Various improvements to the CakePHP test files
|
2015-09-25 18:00:14 -04:00 |
|
Marc Würth
|
a6d62cb6a8
|
Removed $stringClean
Resfs: https://github.com/cakephp/cakephp/pull/7448#discussion_r40450663
|
2015-09-25 20:10:47 +02:00 |
|
Mark Story
|
3aec527fad
|
Merge pull request #7449 from ravage84/2.7-app-skel-sync
App & skel folder sync + some improvements
|
2015-09-25 12:49:20 -04:00 |
|
Mark Story
|
c6c88fe0a7
|
Merge pull request #7446 from ravage84/patch-3
Add cakephp/cakephp-codesniffer as dev dependency
|
2015-09-25 12:47:57 -04:00 |
|
Mark Story
|
12f5aee5a2
|
Merge pull request #7447 from ravage84/2.7-lib-improvements
Various improvements to the CakePHP lib files
|
2015-09-25 12:14:00 -04:00 |
|
Marc Würth
|
41abccc062
|
Update param annotation
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444634
|
2015-09-25 18:12:20 +02:00 |
|
Marc Würth
|
1267586f23
|
Re-add closing tags to ctp files
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444715
|
2015-09-25 18:10:18 +02:00 |
|
Marc Würth
|
f7c472ea1e
|
Add note to param
Refs: https://github.com/cakephp/cakephp/pull/7447#discussion_r40444483
|
2015-09-25 18:03:36 +02:00 |
|
Marc Würth
|
bd461910e9
|
Correct return type
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444444
|
2015-09-25 18:02:44 +02:00 |
|
Marc Würth
|
5eedc0f2bb
|
Fix broken test
|
2015-09-25 17:55:01 +02:00 |
|
Marc Würth
|
dbfd2c44e9
|
App & skel folder sync + some improvements
Mostly CS, doc blocks and some CSS
|
2015-09-25 17:25:35 +02:00 |
|
Marc Würth
|
1ede742d92
|
Various improvements to the CakePHP test files
Mostly CS, doc blocks and unused variables.
|
2015-09-25 17:22:00 +02:00 |
|
Marc Würth
|
e690662f0e
|
Various improvments to the CakePH Plib files
Mostly CS, doc blocks and explicit returning nulls.
|
2015-09-25 17:11:20 +02:00 |
|
Marc Würth
|
fd2dd41330
|
Add cakephp/cakephp-codesniffer as dev dependency
|
2015-09-25 16:51:47 +02:00 |
|
Mark Story
|
b8b7282264
|
Merge pull request #7436 from cakephp/2.8-fix-order-merge
Only array-wrap 'order' if it's not already an array.
|
2015-09-22 12:24:02 -04:00 |
|
Mark Story
|
872f7b9b07
|
Merge pull request #7437 from ravage84/2.8-quiet-testshell
Swallow the "--quiet" shell parameter before calling PHPUnit.
|
2015-09-22 12:22:51 -04:00 |
|
Marc Würth
|
5b41a9b52d
|
Swallow the "--quiet" shell parameter before calling PHPUnit.
PHPUnit does not provide a silent or quiet mode, so we cannot pass it along:
https://phpunit.de/manual/3.7/en/phpunit-book.html#textui.clioptions
Resolves #7432
|
2015-09-22 14:25:53 +02:00 |
|
Mark Scherer
|
8909b2ed42
|
Fix remaining test.
|
2015-09-22 14:21:04 +02:00 |
|
Mark Scherer
|
81cbb52f74
|
Only array-wrap 'order' if it's not already an array.
|
2015-09-22 13:04:28 +02:00 |
|
mark_story
|
c14d1ffe93
|
Add tests for #7428
|
2015-09-21 21:39:51 -04:00 |
|
Mark Story
|
9208a0857e
|
Merge pull request #7428 from burriko/fix-dbo-connection-issues
Fix use of $_connection in DboSource in 2.x
|
2015-09-21 21:38:20 -04:00 |
|
Graeme Tait
|
dc856b8508
|
Switch out is_null()
|
2015-09-21 17:00:20 +01:00 |
|
Graeme Tait
|
1b33efaad3
|
Check $_connection is not null before trying to use it
Stops a fatal error if calling isConnected() after disconnect().
|
2015-09-21 14:08:07 +01:00 |
|
Graeme Tait
|
8fae10a971
|
Set DboSource::$_connection to null on disconnect
|
2015-09-21 14:05:56 +01:00 |
|
ADmad
|
da969bbb80
|
Merge pull request #7427 from cakephp/2.7-cs
Fix CS
|
2015-09-21 18:15:06 +05:30 |
|
Mark Scherer
|
97b6f8674c
|
Fix CS
|
2015-09-21 13:45:18 +02:00 |
|
Mark Story
|
e176e2f4e1
|
Merge pull request #7408 from cakephp/2.7-mysql-datetime
Allow CURRENT_TIMESTAMP for datetime columns - MySQL5.6+.
|
2015-09-17 14:56:47 -04:00 |
|
Mark S.
|
c87de2a069
|
Fix CS
|
2015-09-17 11:33:59 +02:00 |
|
mark
|
e7d6319d59
|
Skip test for versions of < MySQL5.6.
|
2015-09-17 10:43:43 +02:00 |
|
mark
|
d8a55ad065
|
Allow CURRENT_TIMESTAMP for datetime columns - MySQL5.6+.
|
2015-09-16 14:16:58 +02:00 |
|
Mark Story
|
4a316b158e
|
Merge pull request #7387 from cakephp/2.7-fixture
Backport 3.x limit of fixture data generation.
|
2015-09-13 16:14:05 -04:00 |
|
Mark Scherer
|
450a544eb4
|
Backport 3.x limit of fixture data generation.
|
2015-09-13 13:12:53 +02:00 |
|
mark_story
|
e8ce841ffb
|
Merge branch '2.7-sander' into 2.7
Refs #7384
|
2015-09-12 15:28:41 -04:00 |
|
Sander Visser
|
5a7507df4f
|
Fix issue "Debugger class not found"
App::uses('Debugger') not needed because it's allready defined in top of file
|
2015-09-12 15:28:30 -04:00 |
|
José Lorenzo Rodríguez
|
a4a63bfabd
|
Merge pull request #7379 from cakephp/issue-7365
Set the `key` variable in the SessionHelper.
|
2015-09-11 09:55:50 +02:00 |
|
adam1010
|
20c22444ba
|
Increase memory during shutdown for Fatal Error handling
|
2015-09-10 22:01:59 -05:00 |
|
mark_story
|
9eafde13d2
|
Set the key variable in the SessionHelper.
This fixes cross template compatibility between the Flash and Session
helpers.
Refs #7365
|
2015-09-09 22:08:49 -04:00 |
|
Mark Story
|
851ff44b4c
|
Merge pull request #7377 from thomasvnl/patch-1
Update DatabaseSession.php
|
2015-09-09 22:01:34 -04:00 |
|