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
euromark
dc70da9d14
Only merge the _defaults keys.
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
mark_story
ef28b42b2b
Update version number to 2.5.7
2014-12-08 20:50:35 -05:00
ADmad
31c7b01c3a
Add reference links to docblock
2014-12-09 00:03:24 +05:30
ADmad
850edf47a0
Fix plural calculation for Arabic.
...
Refs #5348
2014-12-08 23:58:27 +05:30
Mark Story
0c788d1ebb
Merge pull request #5353 from dereuromark/2.6-verbose
...
Extract being less verbose until explicitly asked for.
2014-12-08 08:47:56 -05:00
euromark
2937ea9ba5
Make comparison stricter.
2014-12-08 11:39:15 +01:00
euromark
f302d8c4d3
Extract being less verbose until explicitly asked for.
2014-12-08 11:36:24 +01:00
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
tranfuga25s
b0d0143b82
Fix PHPCS problems
2014-12-05 16:14:47 -03:00
tranfuga25s
ec2530ba58
Fix PHPCS problems and a better comparation of schema and data
2014-12-05 16:01:49 -03:00
tranfuga25s
fc756ac0b8
fix some small typo changing variables names
2014-12-05 15:34:53 -03:00
tranfuga25s
a2d04589a6
Change to output the difference between fixture data and fields
2014-12-05 15:23:48 -03:00
Mark Story
7bd0a3b32b
Merge pull request #5307 from shin1x1/add-binary-option-in-memcached-engine
...
SASL with Memcached is only supported with binary protocol
2014-12-02 11:01:03 -05:00
shin1x1
a5843dbe87
add binary protocol option in MemcachedEngine
2014-12-02 19:56:30 +09:00
mark_story
bbfe3170dc
Fix incorrect hardcoded database name.
2014-12-01 23:03:47 -05:00
Mark Story
dcbfead855
Merge pull request #5299 from guywarner/add-trigger-doc-2.5
...
Add @trigger to doc blocks of methods triggering CakeEvent
2014-12-01 21:29:24 -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
7e8c3c4ccf
Merge pull request #5293 from ADmad/phpcs-composer
...
Use composer instead of PEAR to get codesniffer.
2014-11-30 15:33:47 -05:00
ADmad
b29cd2f200
Use composer instead of PEAR to get codesniffer.
2014-11-30 23:02:51 +05:30
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
Mark Story
bec99077fe
Merge pull request #5222 from burzum/feature/json-request
...
Feature/json request
2014-11-28 23:35:24 -05:00
Florian Krämer
e7f554cba7
Changing the direct access of super globals in Cake/Network/CakeRequest.php to use env() and fixed a typo.
2014-11-29 03:04:07 +01: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
Mark Story
868f5047ec
Merge pull request #5270 from cakephp/2.6-rlike
...
Allow RLIKE in conditions.
2014-11-26 17:00:32 -05:00
euromark
d0f75a03af
Allow RLIKE in conditions.
2014-11-26 19:56:58 +01:00
Mark Story
ac02350f41
Merge pull request #5261 from sadapon2008/2.x-response-ob_flush
...
an unnecessary E_NOTICE caused by CakeResponse::download()
2014-11-26 07:40:29 -05:00
Tsuyoshi Sadakata
1f4402cd4c
check ob_get_level() before ob_flush()
2014-11-26 17:25:10 +09:00
José Lorenzo Rodríguez
5a9bef2cba
Merge pull request #5253 from cakephp/issue-5234
...
Make the version option function as intended.
2014-11-25 08:11:16 +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
Mark Story
1fed92d94c
Merge pull request #5248 from larryb82/phpunit_as_phar
...
PHPUnit can be included as a phar file.
2014-11-24 20:38:14 -05:00
Lawrence Barsanti
9631b54244
remove space
2014-11-24 16:36:43 -05:00
Lawrence Barsanti
bb5088cda3
PHPUnit can be included as a phar file.
...
No need to install phpunit in order to run unit tests. Simply place
'phpunit.phar' in the vendors folder.
2014-11-24 14:51:36 -05:00