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
Mark Story
2554d29f0a
Merge pull request #5892 from mfn/mf-i18n-extract
...
i18n: add ability to omit POST-Creation-Date from being generated
2015-02-15 10:32:48 -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
400052eab1
Merge pull request #5858 from cakephp/build-fix
...
Remove PHP5.2 from the build matrix.
2015-02-09 21:08:23 -05:00
mark_story
ff39d93299
Remove PHP5.2 from the build matrix.
...
Travis-ci no longer supports PHP5.2. Attempting to run tests on it
causes our builds to fail out. I think this also begs a broader
discussion around supported versions in the future. I'm not personally
comfortable saying we support PHP 5.2 when we don't run tests against it
anymore.
2015-02-07 15:52:34 -05:00
Mark Story
77e8110a1a
Merge pull request #5845 from cakephp/issue-5832
...
Don't create invalid maxlength attributes for decimal columns.
2015-02-06 19:46:24 -05: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
José Lorenzo Rodríguez
035746421b
Merge pull request #5842 from mdabydeen/master
...
Contributing: Fixed a broken link.
2015-02-05 14:16:19 -04:30
Michael Dabydeen
ae8653a066
Contributing: Fixed a broken link.
...
Link to markdown files should end in .md not .mdown.
2015-02-05 13:26:03 -05:00
José Lorenzo Rodríguez
1baee3ca4a
Merge pull request #5837 from davidyell/patch-1
...
Update phpunit.php
2015-02-05 09:12:34 -04:30
David Yell
703be31c83
Update phpunit.php
...
PHPUnit can no longer be installed using pear
2015-02-05 12:02:18 +00:00
ADmad
d62d797e62
Merge pull request #5833 from emolr/load-class-registry-once
...
Load ClassRegistry Once
2015-02-05 02:24:05 +05:30
