AD7six
d7d2516dc1
Remove unwanted whitespace
2015-02-23 17:22:55 +00:00
AD7six
5066bc33b4
Fix whitespace for paginator counter call
2015-02-23 16:46:43 +00:00
AD7six
b151295f1b
Add a better test for the index being correct
2015-02-23 16:46:23 +00:00
AD7six
5342605d92
The parentheses were unbalanced
2015-02-23 15:21:39 +00:00
mark_story
831fe53f79
Ignore LC_TIME category when extracting messages.
...
Given that we use the specific LC_TIME file format, it doesn't make much
sense to extract translated strings into a PO file that cannot be used
later on.
Refs #5933
2015-02-22 22:39:38 -05:00
Michael Houghton
4f2ed15612
fix for confirm message on the bake templates
2015-02-21 10:21:37 +00:00
ADmad
2a57d9b65f
Avoid reloading config file and recreating config instance.
2015-02-20 08:48:25 +05:30
David Steinsland
463fa660bc
Updated test
2015-02-19 17:28:32 +01:00
mark_story
3fee5b9eaa
Update version number to 2.6.2
2015-02-19 07:34:27 -05:00
Jan Dorsman
e3b5306521
Fixing issue #5764
2015-02-19 12:19:27 +05:30
Mark Story
c8ca7cbfd9
Merge pull request #5890 from cakephp/issue-5889
...
Fix doubly linking URLs starting with //
2015-02-16 20:09:25 -05:00
David Steinsland
960ddd0eb8
Added DocBlock
2015-02-15 19:34:28 +01:00
David Steinsland
5fd7396e47
Fixed downloading of files with dots
2015-02-15 19:32:33 +01:00
ADmad
204f50bb97
Allow level field to be null for pqsql and sqlite.
2015-02-15 23:04:13 +05:30
ADmad
e095885dc4
Fix test case
2015-02-15 22:35:42 +05:30
ADmad
6ad68ae1e2
Allow setting level (depth) of tree nodes on save.
...
Backported from 3.0.
2015-02-15 22:29:19 +05:30
ADmad
18246daf17
Merge branch 'master' into 2.7
2015-02-15 21:15:02 +05:30
Mark Story
10b6ba7dc2
Merge pull request #5903 from cakephp/tree-optimization
...
Reduced code nesting.
2015-02-15 10:35:43 -05:00
ADmad
bdc6a1f010
Fix CS error
2015-02-15 19:22:44 +05:30
ADmad
0750a63ed4
Make code DRYer.
2015-02-15 18:36:30 +05:30
Markus Fischer
546941a79b
i18n: Remove POT-Creation-Date
...
Prevent app locale files getting marked as modified in VCS even if the actual
content didn't change.
Fixes #5887
2015-02-15 12:38:48 +01:00
ADmad
844b4beaa6
Reduced code nesting.
2015-02-15 16:30:43 +05:30
Mark Story
9f1f158cc0
Merge pull request #5855 from tanuck/2.7-custom-flash-message
...
Backport of 3.x flash messages #5823
2015-02-14 22:07:30 -05:00
mark_story
b3c9c1615e
Fix doubly linking URLs starting with //
...
Fixes #5889
2015-02-13 21:40:50 -05:00
James Tancock
3cee029aa7
Removed usage of __() for InternalError
2015-02-12 15:09:18 +00:00
mark_story
eb85a875c0
Merge branch 'master' into 2.7
2015-02-10 23:00:43 -05:00
mark_story
3dfa22b021
Fix order of hasOne assocation.
...
This should fix non-deterministic failures.
2015-02-10 22:46:53 -05:00
James Tancock
1cb670bdfa
Add deprecated doctag for current methods
2015-02-10 08:15:01 +00:00
mark_story
b974daac7b
Don't create invalid maxlength attributes for decimal columns.
...
Converting the maxlength to an int avoids any commas from decimal
columns.
Refs #5832
2015-02-05 22:53:40 -05:00
David Yell
703be31c83
Update phpunit.php
...
PHPUnit can no longer be installed using pear
2015-02-05 12:02:18 +00:00
Emil Møller
3f715c4262
Load ClassRegistry Once
2015-02-04 21:29:16 +01:00
James Tancock
e173c29d33
Fix for phpcs
2015-02-04 15:31:50 +00:00
James Tancock
b8b6b67abd
Tests for ported Flash component & helper
2015-02-04 15:05:40 +00:00
James Tancock
2ff6bdccec
Back port of Flash component & helper
2015-02-04 12:18:31 +00:00
Rachman Chavik
acd32b71fe
Fix: "bake plugin" generates incorrect directory for View/Layouts
2015-02-04 15:47:01 +07:00
James Watts
970cb81d03
Typo typo
2015-02-02 02:07:13 +01:00
ADmad
54fe7ed204
Add method to get depth of tree's node.
...
Backported from 3.0.
2015-02-01 17:27:46 +05:30
Mark Story
151f6e90e0
Merge pull request #5673 from davidsteinsland/fix_exception_handler_nesting
...
Fixed nesting when ExceptionRenderer throws exception
2015-01-28 22:00:57 -05:00
Mark Scherer
611889235a
Fix clear(). Add test cases.
2015-01-28 23:54:32 +01:00
Mark Story
35e0dc2bbd
Merge pull request #5760 from cakephp/master
...
Merge master into 2.7
2015-01-27 20:48:15 -05:00
tgskiv
97c6850005
Let IDE work better with ClassRegistry::init()
...
This small change will allow some IDEs like NetBeans to work with returned object like with a instance of $class parameter.
I`m sure, this will help Cake users a lot!
2015-01-27 19:06:46 +02:00
Mark Story
b5cbe4de58
Merge pull request #5744 from cakephp/master-hotfix-testing
...
Fix ControllerTestCase redirect assert by always using 302 for redirect()
2015-01-26 20:27:36 -05:00
Mark Scherer
4fa5dd62c5
Remove conditional status setting.
2015-01-26 23:47:20 +01:00
Mark Scherer
70276b7a7a
Doc block adjustment.
2015-01-26 10:35:02 +01:00
Mark Scherer
e753fbadca
Fix ControllerTestCase redirect
2015-01-26 10:31:04 +01:00
Mark Scherer
76f7754014
Adding a status code test.
2015-01-26 10:29:52 +01:00
mark_story
a8ae12a700
Fix warnings when php://output is used with ConsoleOutput.
...
The php://output stream is not compatible with posix functions.
Refs #4901
2015-01-25 22:24:24 -05:00
AD7six
f9ba950ad4
Skip Sqlite
...
Sqlite will accept an insert with duplicate primary keys and silently
drop the query. There is no exception, or indication that the insert
failed.
2015-01-23 08:47:05 +00:00
AD7six
5e89e893f2
Ignore counter cache also
2015-01-23 08:30:34 +00:00
AD7six
c0ee49fe88
Remove callbacks to speed up saving
2015-01-23 08:30:26 +00:00
AD7six
838d23300b
Remove some exists checks by not validating
2015-01-23 08:29:59 +00:00
AD7six
51bd1d0a2b
If a PDOException is thrown, try again.
...
This can occur if the exists check returns no rows, but before this
request inserts into the database a _different_ thread inserts a
session record.
2015-01-23 08:28:08 +00:00
AD7six
e86365ca0f
Add a failing test for session concurrency problems
2015-01-22 23:04:34 +00:00
mark_story
4e33ef0386
Merge branch 'issue-5712' into master.
2015-01-21 23:32:25 -05:00
mark_story
58334996a2
Fix PHPCS errors.
2015-01-21 23:32:08 -05:00
Mark Story
49a08dc259
Merge pull request #5709 from cakephp-fr/2.x-pot-files
...
put message in cake.pot file instead of default.pot
2015-01-21 23:24:41 -05:00
Ceeram
9ce75e6fd6
No need to get the datasource if column is defined in schema. Fixes #5712
2015-01-22 00:46:55 +01:00
Richan Fongdasen
fd47d26f6b
Keep the user agent list in alphabetical order
2015-01-21 22:50:46 +07:00
cake17
2c251b80af
put message in cake.pot file instead of default.pot
2015-01-21 16:41:34 +01:00
Richan Fongdasen
a7d604bca8
Add mobile agent for Blackberry Z10 and Blackberry Z30, fixes #5706
2015-01-21 13:47:03 +07:00
Mark Story
3cc3db8380
Merge pull request #5681 from robertpustulka/2.7-short-plugin-shell
...
2.7 - Short plugin alias in shells
2015-01-19 21:44:47 -05:00
mark_story
511ee1f776
Fix strict error with 2.6 code.
2015-01-19 21:43:14 -05:00
Robert
c755d9b5e5
Updated comments
2015-01-19 08:55:40 +01:00
Robert
db1442573d
Fix failing tests
2015-01-19 08:51:57 +01:00
Robert
f4933b29a8
CS fix
2015-01-19 08:51:57 +01:00
Robert
dedb2e4191
Added short plugin alias in shells
2015-01-19 08:51:57 +01:00
mark_story
3078a1eb52
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-01-16 22:22:26 -05:00
David Steinsland
e5d1846d4b
Fixed PHP 5.2 compatibility
2015-01-16 16:02:44 +01:00
David Steinsland
e37db25ce0
Change configuration property to static class property
2015-01-16 14:47:44 +01:00
Mark Scherer
d37721ab0e
Fix notice in PaginatorHelper when model params are not available.
2015-01-16 14:11:32 +01:00
mark_story
09e5e43d09
Update version number to 2.6.1
2015-01-15 21:36:35 -05:00
Mark Story
2a9f2d4b58
Merge pull request #5668 from cakephp/issue-5649
...
Fix numeric values not being quoted for MySQL set columns.
2015-01-15 21:29:57 -05:00
Mark Story
8969565526
Merge pull request #5675 from cakephp/master-docs
...
Correct CakeSocket docblocks.
2015-01-15 21:27:30 -05:00
mark_story
396d501d1e
Fix / being handled incorrect by referer()
...
Backport changes in #4987 to 2.x. This solves issues with duplicate base
directories when redirecting back to '/'
Fixes #4812
2015-01-15 21:26:34 -05:00
mark_story
d4a6d3f6c0
Fix numeric values not being quoted for MySQL set columns.
...
Set columns should always have their values quoted. Not quoting values
makes MySQL do bad things.
Refs #5649
2015-01-15 21:10:33 -05:00
Mark Scherer
2b1e487530
Correct CakeSocket docblocks.
2015-01-15 23:39:09 +01:00
David Steinsland
a5e1be7abf
Fixed tests
2015-01-15 23:11:36 +01:00
David Steinsland
e5134986e6
Reset Exception.bail just in case
2015-01-15 20:10:48 +01:00
David Steinsland
ed3b15f13b
Fixed phpcs
2015-01-15 20:04:06 +01:00
David Steinsland
f621bb7fe5
Fixed nesting when ExceptionRenderer throws exception
2015-01-15 19:20:28 +01:00
David Steinsland
687d0b44f5
Backport of https://github.com/cakephp/cakephp/issues/5667
2015-01-15 11:00:27 +01:00
mark_story
d39c744c28
Fix PHPCS error.
2015-01-12 21:37:34 -05:00
mark_story
7b20884d43
Fix failing tests.
2015-01-12 21:36:28 -05:00
Mark S.
77e8661cb7
Merge pull request #5651 from bcrowe/copyright
...
Bump copyright year in license
2015-01-12 21:47:04 +01:00
Bryan Crowe
6a83e6b1de
Bump copyright year in license
2015-01-12 15:18:04 -05:00
mark_story
ac9a212d44
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/Utility/String.php
2015-01-11 15:25:18 -05:00
mark_story
cd58fa0b61
Backport changes from #5635 to 2.x
...
In case the path passed to the File class doesn't exists, this will
cause File::$path to be set to a partial path, that is the filename
of the passed path with a slash prepended, ex with
$file = new File('/non/existent/file');
calling $file->pwd() will return/set /file, possibly causing that
file in the root to be accessed.
2015-01-11 15:20:34 -05:00
José Lorenzo Rodríguez
0a4141c78c
Merge pull request #5614 from cakephp/issue-5595
...
Convert header_sent exception into a notice error.
2015-01-09 22:25:09 +01:00
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
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
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
Bryan Crowe
66a0e6226d
Correct criterion inflection
2015-01-06 23:03:53 -05:00
Mark Story
c4f9727720
Merge pull request #5576 from istvanp/2.7
...
Prevent NULL value on NOT NULL column when value is an empty string
2015-01-06 21:23:53 -05:00
euromark
389f745d16
Stop goofy formatting when newlines are present already.
2015-01-06 13:13:33 +01:00
Istvan Pusztai
22b0275a58
Prevent NULL value on NOT NULL column when value is an empty string (MySQL)
2015-01-05 12:04:24 -05: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
euromark
52ecccb1a2
App::uses and usage replacements for String => CakeText.
2015-01-05 01:00:57 +01:00
euromark
63093e1d30
More String CakeText replacements and a BC class.
2015-01-05 00:55:23 +01:00
euromark
274b78e44c
Rename test case.
2015-01-05 00:54:36 +01:00
euromark
722e54279c
Rename String to CakeText.
2015-01-05 00:53:32 +01:00
Mark S.
b76fbd8da1
Merge pull request #5557 from cakephp/2.7-configure-backport
...
Backport of 3.0 Configure corrections.
2015-01-04 23:57:56 +01:00
Gerd Katzenbeisser
bf3ff8e2ad
Avoid connection to default for mocked models
...
Fixes #5565
2015-01-04 16:53:00 +01:00
euromark
394da88d23
Stay 100% BC for 2.7
2015-01-04 10:52:18 +01:00
euromark
dabf55785f
Simplify test assert.
2015-01-04 02:30:11 +01:00
euromark
a947958dc9
Fix cs
2015-01-04 02:27:40 +01:00
euromark
d848c5f327
cs
2015-01-04 02:22:37 +01:00
euromark
b936a34471
Backport of 3.0 Configure corrections.
2015-01-04 01:57:06 +01:00
euromark
39e0ce415d
Backport of 3.0 Session API hardening and clear().
2015-01-04 01:40:09 +01:00
mark_story
4cd2c8fdcb
Merge branch 'master' into 2.7
2015-01-03 14:34:55 -05: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
Kaz Watanabe
e5fc1858f9
fix error at change type of text field to integer in PostgreSQL
2014-12-30 09:27:46 +09: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
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
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
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
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
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
euromark
22a4a2f5de
Correct argument. Should not have a default string.
2014-12-23 15:36:25 +01:00
euromark
d089341ee7
Wording.
2014-12-23 13:46:55 +01: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
euromark
545ff20e1d
Add component and helper wrapper methods.
2014-12-23 03:50:35 +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
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
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
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
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
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
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
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
mark_story
cf108dbff3
Remove duplicate order key.
...
This was a mistake made in 4b6dba0Fixes #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
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
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
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
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
