euromark
23ef13f9c7
adding Kazakh and correcting some locales
2013-02-10 20:07:09 +01:00
ADmad
13029cc2bc
Merge branch 'master' into 2.4
2013-02-09 02:20:16 +05:30
ADmad
431e610317
Fix broken tests
2013-02-08 19:04:41 +05:30
Graham Weldon
26a08c6780
Updated copyright
2013-02-08 21:28:17 +09:00
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
euromark
d522f412db
Fix disabled elements as array for multiple select and make in_array() work properly here, fix same in_array issues for radio elements and move tests correctly - #1105
2013-02-07 15:36:00 +01:00
mark_story
1ceb17589a
Merge branch 'master' into 2.4
2013-02-06 21:05:03 -05:00
ADmad
0b46b042b9
Changed params for HtmlHelper::css() to be consistent with HtmlHelper::script().
...
Closes #3593
2013-02-05 23:22:24 +05:30
ADmad
afb62959ef
Added JSONP support for JsonView
2013-02-04 23:20:49 +05:30
mark_story
103bbbc375
Add CakeRequest::param()
...
This method gives a read accessor to the data in $request->params.
It removes the need to use isset() and empty().
2013-02-03 22:09:52 -05:00
Mark Story
e0ce0ac8e3
Merge pull request #1103 from perrywky/master
...
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery
Fixes #3579
2013-02-01 06:36:06 -08:00
Ceeram
fa1d22dc5e
added test to disprove #3588
2013-01-31 16:21:01 +01:00
ADmad
fb7fbcf01b
Added option to disable counter caches updating.
...
Closes #3109
2013-01-31 18:14:39 +05:30
ADmad
8ff59586f6
Merge branch 'master' into 2.4
2013-01-31 18:12:01 +05:30
Perry
5ac5e784de
fix a DboDataSource buildJoinStatement bug that table prefix is appended to subquery
2013-01-31 17:01:59 +08:00
euromark
ee08fe5c1f
BC fixes for disabled checkboxes
...
see: d504642
see: #3545
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-31 09:44:35 +07:00
Rachman Chavik
1cb24384cd
Merge branch '2.2'
2013-01-31 09:42:55 +07:00
euromark
d504642c9b
BC fixes for habtm. Closes #3545 .
...
Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
2013-01-30 21:11:41 +07:00
mark_story
78b23d8e31
Fix issue with inputs() and plugin models.
...
inputs() should not trigger errors when generating inputs for plugin
models. Previously the internal state of FormHelper was incorrect as
model() returned the plugin name instead of the modelname.
Fixes #3571
2013-01-29 22:02:21 -05:00
Rik van der Heijden
e331ae64ee
Fix CrudAuthorizeTest, added Router::reload() in setUp
2013-01-29 21:35:29 +01:00
ADmad
bb767408d3
Fix cs errors
2013-01-27 23:03:06 +05:30
ADmad
04ec9dd614
Renamed AuthComponent::redirect() to AuthComponent::redirectUrl().
...
Closes #3268
2013-01-27 21:22:11 +05:30
ADmad
422ceaff85
Added "tel" and "email" input type guessing.
...
Closes #3557
2013-01-27 08:59:54 +05:30
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Mark Story
1fc9641af3
Merge pull request #1089 from majna/2.3-sort-natural
...
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
2013-01-25 18:49:16 -08:00
mark_story
ce7f85abe8
Fix Token fields being added to GET forms.
...
They are not used so there is not much point in appending them.
Fixes #3565
2013-01-25 15:21:16 -05:00
Mark Story
bc4db91b51
Merge pull request #864 from dereuromark/2.3-radio-multiple-between
...
allow between to be an array of strings
Fixes #2859
2013-01-25 12:06:55 -08:00
Majna
5250c92635
Fix Hash::sort() 'natural' type fallback on PHP < 5.4
2013-01-25 01:07:45 +01:00
mark_story
e4f241dd23
Merge branch 'pr-1075'
...
Merge changes in pull request 1075.
2013-01-23 21:19:53 -05:00
mark_story
0b659d513e
Add tests for #3545
...
Fix included in GH-1075
Closes #3545
2013-01-23 21:19:37 -05:00
Mark Story
6ade91e83b
Merge pull request #1083 from ceeram/2.3-pmdvars
...
Remove unused local vars.
2013-01-23 14:51:11 -08:00
Ceeram
16be9d4990
remove unused local vars
2013-01-23 17:22:06 +01:00
ADmad
82f34c4cb3
Don't set "required" attribute for checkboxes (unless explicitly specified).
...
Adding it prevents user from submitting form with checkbox unchecked when the "boolean" validation rule is specified for the field.
Closes #3560
2013-01-23 20:38:24 +05:30
mark_story
0cdef75060
Fix failing tests.
...
I have no idea why the updated session test was expected to fail as the
data was written to the session.
Refs #3551
2013-01-21 21:13:35 -05:00
mark_story
75495705a6
Fix Hash::get($data, '0')
...
Fixes #3555
2013-01-21 20:50:46 -05:00
mark_story
7790bcacff
Allow afterFind() to fully remove an associated record.
...
By returnning array() or unsetting the 0'th result an afterFind
callback should be able to fully remove data from the results.
Fixes #3541
2013-01-17 20:35:37 -05:00
mark_story
773666ddad
Fix coding standards and save a function call.
2013-01-17 20:34:25 -05:00
Mark Story
acc6a2645f
Merge pull request #1039 from bfanger/master
...
Fixes an issue with urls as GET parameters
2013-01-17 17:31:59 -08:00
Renan Gonçalves
23d4807933
Fixing expected value from find when it results in failure.
...
When a behavior callback (eg: beforeFind) stops the event, find will return null. False is really never returned from find().
2013-01-17 13:00:56 +01:00
Mark Story
70171f5403
Merge pull request #1073 from cakephp/issue-3533
...
Partially revert default niceShortFormat
The changes introduced in 2.2 dramatically changed the output from 2.1, this change attempts to be a compromise between the 2.1 format and the 2.2 format.
Fixes #3533
2013-01-16 18:08:44 -08:00
mark_story
95ed471c41
Reduce duplication in code.
...
This will result in all tests being skipped when any of the required
models pre-exists.
2013-01-16 12:59:13 -05:00
mark_story
5a6a45d0d1
Add support for --admin to bake controller all.
...
I missed this when originally implementing bake controller all.
Fixes #3536
2013-01-16 12:57:18 -05:00
mark_story
ad0d6644c4
Partially revert default niceShortFormat
...
In 9fa531d6e3
the default niceShortFormat
was changed, which has been interpreted as a regression in #3533 .
This change partially reverts the previous change and tries to strike
a balance between the old behavior and new.
Refs #3533
2013-01-14 21:12:11 -05:00
mark_story
9c29fab4a4
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Network/Http/HttpResponse.php
2013-01-14 20:24:56 -05:00
U-Zyn Chua
bcdbdc8108
Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531
2013-01-15 09:17:24 +08:00
ADmad
d8551c49e5
Improve messages logged for exceptions
2013-01-12 11:30:25 +05:30
ADmad
676872d623
Allow AuthComponent::$unauthorizedRedirect to be an url.
...
Closes #3494
2013-01-12 11:25:13 +05:30
Mark Story
e7330fa585
Merge pull request #1067 from ceeram/paginatecount
...
Avoid calling paginateCount when there are no results.
2013-01-11 18:09:32 -08:00
José Lorenzo Rodríguez
d571b056f4
Merge pull request #1063 from ADmad/2.3-cakeplugin
...
Added feature to ignore include errors for CakePlugin
2013-01-11 15:13:54 -08:00