Commit graph

7393 commits

Author SHA1 Message Date
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