Commit graph

18926 commits

Author SHA1 Message Date
ADmad
08ed3c55fd Merge pull request #6049 from ravage84/patch-1
Fixed link to cookbook
2015-03-11 17:16:46 +05:30
Marc Würth
4f9d764fc2 Fixed link to cookbook 2015-03-11 11:27:30 +01:00
mark_story
0b916cedbb Merge branch 'master' into 2.7 2015-03-09 21:55:20 -04:00
mark_story
cad57dcc28 Use DS instead of checking both slash styles.
Refs #5905
2015-03-09 21:55:07 -04:00
Mark Story
43f16f38f0 Merge pull request #5905 from davidsteinsland/fix_file_response_dots
Fix file response dots
2015-03-09 21:54:02 -04:00
José Lorenzo Rodríguez
b4f78572fc Merge pull request #6030 from cakephp/issue-6028
Fix whitelist being empty during afterSave.
2015-03-08 19:07:05 +01:00
mark_story
a9519d39f7 Fix whitelist being empty during afterSave.
whitelist should only be reset after afterSave event.

Refs #6028
2015-03-08 13:51:46 -04:00
ADmad
534154f4f1 Merge pull request #6021 from jadedcore/master
Object has App::uses('CakeLog', 'Log') twice
2015-03-07 00:29:25 +05:30
Chris Valliere
0dca5c8877 Using App::uses('CakeLog', 'Log') twice
I think this was accidentally added twice?
2015-03-06 13:41:40 -05:00
ADmad
7173f21dc8 Type hint model param 2015-03-04 21:15:24 +05:30
ADmad
a1286e9e7d Prefix fields with model alias 2015-03-04 21:11:18 +05:30
Mark Story
86f4690d93 Merge pull request #5991 from mvdriel/fix-return-type-of-toQuarter
Fixed return type of toQuarter in CakeTime and TimeHelper
2015-03-02 12:38:20 -05:00
Mark van Driel
ed5da19d10 Fixed return type of toQuarter in CakeTime and TimeHelper 2015-03-02 12:08:11 +01:00
José Lorenzo Rodríguez
a6ceec149a Merge pull request #5981 from cakephp/issue-5973
Make maxLimit and limit settings independent.
2015-03-01 19:48:26 +01:00
Mark Story
01d988fa77 Merge pull request #5980 from cakephp/issue-5977
Don't generate maxlength properties for decimal columns.
2015-02-28 16:37:09 -05:00
mark_story
02c9dda9a7 Make maxLimit and limit settings independent.
Having maxLimit infer what it should be based on limit was not a very
transparent default behavior. The documentation states that maxLimit
will default to 100, but the code would default it to 'limit' if set.
This created confusing behavior when only one setting was defined.

Refs #5973
2015-02-27 22:35:52 -05:00
mark_story
8dba9879d4 Don't generate maxlength properties for decimal columns.
Int casting the decimal scale isn't going to work in a number of
situations as users may end up trying to include decimal points, commas
or spaces in larger amounts.

Fixes #5977
2015-02-27 21:08:54 -05:00
Mark Story
54edb1cfa6 Merge pull request #5976 from kulltc/master
Make sure default datasource is not used for mock
2015-02-27 17:41:55 -05:00
KullTC
a7c2f26599 Make sure default datasource is not used for mock
When a non-default datasource is used for a model and no test_ version of
that datasource is available, the getMockForModel method used the
models standard datasource, rahter than 'test'.
2015-02-27 15:26:49 +01:00
José Lorenzo Rodríguez
bc4bca9737 Merge pull request #5974 from cakephp/issue-5838
Make global paths for vendors and plugins based on ROOT.
2015-02-27 09:16:19 +01:00
Mark Story
19f28c419e Merge pull request #5954 from cakephp/issue-5948
Check line length to account for fence post.
2015-02-26 19:58:06 -05:00
mark_story
63769ae4a6 Merge branch 'master' into 2.7
Conflicts:
	lib/Cake/VERSION.txt
2015-02-26 12:50:35 -05:00
mark_story
aec0241a4c Make global paths for vendors and plugins based on ROOT.
Using CAKE means that composer installed CakePHP will generate incorrect
'global' paths.

Refs #5838
2015-02-26 12:49:04 -05:00
José Lorenzo Rodríguez
de255aebb6 Merge pull request #5970 from cakephp/issue-5964
Allow numeric sorts in PaginatorComponent.
2015-02-26 09:01:39 +01:00
mark_story
c92cfb413f Allow numeric sorts in PaginatorComponent.
When paginating data, we should not ignore numerically indexed order
conditions. Instead they should be handled similar to Model::find().

This creates a slightly different behavior when model's have default
sorting applied as more default sort options forms will be honoured.

Refs #5964
2015-02-25 21:38:56 -05:00
mark_story
ea79cf5d13 Fix words with WWW in them being autolinked.
Don't autolink words that don't have `www.` in them.

Fixes #5968
2015-02-25 20:52:35 -05:00
mark_story
b80a8947d7 Check line length to account for fence post.
When we have exactly 998 bytes CakeEmail should not emit an error.

Refs #5948
2015-02-24 21:52:34 -05:00
Mark Story
077b16cb4b Merge pull request #5926 from cakephp/issue-5764
Fix for issue #5764
2015-02-24 21:51:26 -05:00
Mark Story
ef820964e5 Merge pull request #5952 from cakephp/issue-5950
Correct baked index parse error
2015-02-23 13:17:28 -05:00
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
José Lorenzo Rodríguez
71f1c461d9 Merge pull request #5945 from cakephp/issue-5933
Ignore LC_TIME category when extracting messages.
2015-02-23 13:41:46 +01: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
Mark Story
ffab0c1c82 Merge pull request #5935 from MichaelHoughton/master
fix for confirm message on the bake templates
2015-02-21 08:34:37 -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
Mark Story
8f50f1eab2 Merge pull request #5904 from ADmad/2.7-tree-level
2.7 tree level
2015-02-16 06:45:41 -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