Emil Møller
3f715c4262
Load ClassRegistry Once
2015-02-04 21:29:16 +01:00
Mark Story
195c348b9d
Merge pull request #5831 from rchavik/2.6-fix-layout-dir
...
2.6 - Fix: "bake plugin" generates incorrect directory for View/Layouts
2015-02-04 14:27:43 -05: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
Mark Story
26bb3a549f
Merge pull request #5806 from ADmad/2.7-tree-getlevel
...
2.7 - Add method to get depth of tree's node.
2015-02-02 19:32:59 -05: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
3b8114ce00
Merge pull request #5782 from TamasBarta/patch-1
...
Adding webfont formats as binary in .gitattributes
2015-01-29 12:03:51 -05:00
Tamás Barta
8a600e357b
Adding webfont formats as binary in .gitattributes
...
With the current state, our Linux workstations with default configs convert fonts' line endings, and that screws them up. These lines fix this.
2015-01-29 16:38:01 +01:00
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 Story
7866605c71
Merge pull request #5773 from cakephp/2.7-session
...
Session issue in 2.7
2015-01-28 21:18:20 -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
Mark Story
820d572139
Merge pull request #5759 from tgskiv/patch-1
...
Let IDE work better with ClassRegistry::init()
2015-01-27 15:11:35 -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 Story
53f52cef3c
Merge pull request #5743 from cakephp/issue-4901
...
Fix warnings when php://output is used with ConsoleOutput.
2015-01-26 17:44:22 -05: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
Mark Story
4113eb0db4
Merge pull request #5717 from cakephp/2.7-session-concurrency
...
2.7 session concurrency
2015-01-23 13:16:49 -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
Mark Story
2b89f6eb4f
Merge pull request #5707 from richan-fongdasen/richan-fongdasen
...
Add mobile agent for Blackberry Z10 and Blackberry Z30, fixes #5706
2015-01-21 23:24:17 -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
Mark Story
c5c9c3ac42
Merge pull request #5680 from cakephp/master-fix-notice
...
Fix notice in PaginatorHelper when model params are not available.
2015-01-16 13:05:33 -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