Dave Hensley
|
0003296f42
|
Add CAKE directory fallthrough for plugins/vendors
Fixes issue #6124.
|
2015-03-20 17:35:19 -04:00 |
|
mark_story
|
744952e344
|
Fix FormHelper::create() dropping 0 value parameter.
When 0 is the first passed parameter we shouldn't drop it.
Fixes #6107
|
2015-03-19 21:15:20 -04:00 |
|
ceeram
|
af65067b50
|
Merge pull request #6105 from dakota/fix-memcache
Fix issue with memcache and domains starting with letter "u"
|
2015-03-19 12:02:45 +01:00 |
|
Walther Lalk
|
359c0ab816
|
Fix issue with memcache and domains starting with letter "u"
|
2015-03-19 11:42:14 +02:00 |
|
José Lorenzo Rodríguez
|
277f641108
|
Merge pull request #6064 from robmcvey/jsonView
2.6 jsonView should throw exception if json_encode fails
|
2015-03-18 10:01:40 +01:00 |
|
José Lorenzo Rodríguez
|
e607548fce
|
Merge pull request #6093 from cakephp/issue-6090
Fix notice errors in pagination link generation.
|
2015-03-18 09:33:39 +01:00 |
|
mark_story
|
6df7bf9c21
|
Fix notice errors in pagination link generation.
No errors should be emitted when creating links for models that were not
paginated.
Refs #6090
|
2015-03-17 22:19:17 -04:00 |
|
Mark Story
|
c3e1ba1dc9
|
Merge pull request #6089 from garas/2.6-i18n-ExtractTask-function-warnings
Do not warn about i18n functions definitions on extract task
|
2015-03-17 10:21:26 -04:00 |
|
Edgaras Janušauskas
|
b444fe7b81
|
Do not warn about i18n functions definitions on extract task
|
2015-03-16 23:16:50 +02:00 |
|
mark_story
|
02c40d5ca5
|
Update version number to 2.6.3
|
2015-03-15 22:06:30 -04:00 |
|
Rob McVey
|
4741abcd63
|
Remove whitespace
|
2015-03-15 11:14:49 +00:00 |
|
Rob McVey
|
d94e05cf76
|
Assert exception msg contains UTF-8
The different versions of PHP throw several various messages for UTF-8
sequences, so this just performs a basic regex check
|
2015-03-15 11:01:51 +00:00 |
|
Rob McVey
|
a59a057133
|
assert correct exception msg thrown
|
2015-03-15 10:36:06 +00:00 |
|
mark_story
|
827465fa30
|
Merge branch 'postgres_altercolum_error' into master
Merge changes from #5512 into master. This fixes changing columns in
postgres to integer from string types.
|
2015-03-14 22:23:43 -04:00 |
|
mark_story
|
c32e5559bb
|
Add test to ensure column was converted to integer.
Refs #5512
|
2015-03-14 22:23:17 -04:00 |
|
mark_story
|
8cadb553d7
|
Merge branch 'master' into 2.7
|
2015-03-14 22:08:53 -04:00 |
|
Rob McVey
|
b3c961bc9e
|
Tickle Travis
|
2015-03-14 13:45:50 +00:00 |
|
Rob McVey
|
fe0ddf2171
|
Assert exception is thrown, reset error handler in tearDown
|
2015-03-14 13:27:34 +00:00 |
|
Rob McVey
|
56c6f02efc
|
Remove tabs
|
2015-03-14 13:16:05 +00:00 |
|
Rob McVey
|
d3c24be84b
|
add a custom error handler for tests of json_encode
|
2015-03-14 13:12:09 +00:00 |
|
Rob McVey
|
5002bd4dbe
|
Use fall back json_last_error_msg
|
2015-03-14 09:21:15 +00:00 |
|
Rob McVey
|
10cfb878be
|
fallback implementation of json_last_error_msg
|
2015-03-14 09:13:31 +00:00 |
|
Rob McVey
|
bcb6549565
|
add throws tag to function comment
|
2015-03-14 08:45:18 +00:00 |
|
Rob McVey
|
842cdf58f8
|
Don't translate errors
|
2015-03-14 08:34:06 +00:00 |
|
Mark Story
|
f2dd8eaa82
|
Merge pull request #6067 from ionas/patch-3
2.6.2: cake bake / ModelTask should respect decimal
|
2015-03-13 19:55:20 -04:00 |
|
Jonas
|
5f40161e24
|
2.6.2: cake bake / ModelTask should respect decimal
PR for https://github.com/cakephp/cakephp/issues/6066
|
2015-03-13 21:35:12 +01:00 |
|
Rob McVey
|
3b01c5f842
|
suppress warnings so test runner doesn't fart
|
2015-03-13 16:58:29 +00:00 |
|
Rob McVey
|
b880714231
|
coding standards elseif
|
2015-03-13 16:27:24 +00:00 |
|
Rob McVey
|
2ba9f3b8fb
|
Encoding false is OK - should return string null
|
2015-03-13 16:21:54 +00:00 |
|
Rob McVey
|
ddfcb06d02
|
Coding standards
|
2015-03-13 16:13:29 +00:00 |
|
Rob McVey
|
08620704be
|
Handle json_encode failure
|
2015-03-13 16:12:21 +00:00 |
|
Rob McVey
|
05aba7afb6
|
Assert CakeException throw when json_encode fails
|
2015-03-13 15:52:22 +00:00 |
|
mark_story
|
8e735c2db0
|
Fix class name in scaffold error.
Fixes #6061
|
2015-03-12 22:00:03 -04:00 |
|
Bryan Crowe
|
5f90f455fd
|
Merge pull request #6059 from davidyell/patch-2
Update App.php
|
2015-03-12 11:33:14 -04:00 |
|
David Yell
|
24edae5792
|
Update App.php
Add a missing apostrophe
|
2015-03-12 15:26:59 +00:00 |
|
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 |
|