mark_story
7d51db9e63
Merge branch '2.0' into 2.1
2012-03-03 12:27:22 -05:00
Mark Story
3f4be3bc38
Merge pull request #541 from tkyk/paginatorhelper-merge-query
...
PaginatorHelper should merge request->query to url options
2012-03-03 09:26:22 -08:00
Takayuki Miwa
1475e87b38
Update PaginatorHelper::beforeRender to merge request->query with url options
2012-03-03 13:46:46 +09:00
José Lorenzo Rodríguez
4f2d7b5f9a
Merge pull request #540 from radig/2.0
...
Make UpgradeShell recognize different code style
2012-03-02 14:06:24 -08:00
Cauan Cabral
a3a2d55c94
Enable UpgradeShell to recognize new line between class name and {
2012-03-02 17:43:02 -04:00
mark_story
0b4f735b4c
Update API docs for Set::extract()
...
Fixes #2634
2012-03-02 11:19:17 -05:00
Renan Gonçalves
3412c0cb0f
Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer.
2012-03-02 15:59:59 +01:00
Renan Gonçalves
6d3bc7be86
Removing ReflectionMethod::setAccessible() from tests, it was limiting to PHP 5.3.2 or newer.
2012-03-02 15:55:58 +01:00
Jose Lorenzo Rodriguez
c84e25e5b4
Moving $_minimizedAttributes form HtmlHelper back into Helper, as _parseAttributes is using it
2012-03-01 14:56:56 -04:30
José Lorenzo Rodríguez
96f73d6392
Merge pull request #538 from mcammaert/2.1
...
Merging input defaults with passed options to preserve nested keys
2012-02-29 09:09:11 -08:00
Mark Story
9d017c2b5c
Merge pull request #535 from michaelhagedon/2.1
...
Fixing _fromArray()
2012-02-29 08:32:45 -08:00
Manu Cammaert
9c24f81379
Test Case for Formhelper Bug
2012-02-29 11:03:55 +01:00
mark_story
1ddcde7c86
Fix how $uses is handled.
...
$uses now defaults to true. All falsey values turn some features
off, and most truthy values enable them.
Fixes #2590
2012-02-28 19:35:06 -05:00
Manu Cammaert
cd2dca205c
default options are lost in case of eg. validation error
2012-02-28 23:39:16 +01:00
Rob McVey
8e93c4cd34
Fix for Consolce/Task/TestTask::getRealClassName(). Controller names of exactly 10 letters
...
being returned incorrectly
Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 15:21:59 -05:00
Michael Hagedon
5eb4155236
Fixing case.
2012-02-28 13:20:47 -07:00
Mark Story
6599422a7a
Merge pull request #534 from dogmatic69/2622
...
Fixes #2622
2012-02-28 12:11:44 -08:00
Michael Hagedon
ef80045fc5
Fixing _fromArray(). See http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/2624-xml_fromarray-does-not-handle-certain-array-structures-as-expected
2012-02-28 12:41:43 -07:00
dogmatic69
ac06880241
making the name lowercase in the addDetector method so that it will be found in the is() method fixes #2622 with tests.
2012-02-28 16:05:32 +00:00
mark_story
2665178ec9
Merge branch '2.0' into 2.1
2012-02-28 07:04:20 -05:00
Norio Suzuki
757579e1d1
Fixed a testcase, support PostgreSQL 9.1
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 06:32:31 -05:00
ADmad
12364cac8c
Fixed indentation
2012-02-28 02:04:43 +05:30
mark_story
0568746bfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
mark_story
d577d6b84e
Change cake.php to allow cake libs at ROOT
...
Splice the ROOT path into the include_path for console apps.
This allows users to override the system include_path with a local
version of CakePHP.
Fixes #2613
2012-02-26 12:03:22 -05:00
mark_story
faeb7b4536
Fix error creating schema files.
...
If you removed app/Config/Schema and tried to create
schema files, you'd get an error instead of a file.
Fixes #2618
2012-02-26 10:25:39 -05:00
mark_story
2a9a103d62
Fix bad xml help generation.
...
Fixes #2619
2012-02-26 10:21:04 -05:00
ADmad
a31be56f42
Wrapping error string in translator function.
2012-02-26 20:34:30 +05:30
mark_story
7665f369fa
Merge branch '2.1-type-hinting-corrections' into 2.1
2012-02-25 20:07:18 -05:00
mark_story
e958e6c25f
Fix strict and warning errors from type hints.
2012-02-25 20:06:48 -05:00
euromark
973dce916a
php5 corrections
2012-02-25 19:46:07 -05:00
euromark
42762fffa9
fix broken test
2012-02-25 19:46:06 -05:00
euromark
45112088a1
type hinting models
2012-02-25 19:46:06 -05:00
euromark
22452f61f8
type hinting controllers and views
2012-02-25 19:46:06 -05:00
euromark
38c3e30a1e
visibility attributes
2012-02-25 19:46:06 -05:00
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
Ceeram
677f0708dc
create View instance after adding model params for request
2012-02-24 18:16:53 +01:00
José Lorenzo Rodríguez
2840dc74d3
Merge pull request #528 from vantienvnn/2.0
...
CakeRequest::here explicitly using & as a query string separator to overcome issue in some badly configured 5.3 servers
2012-02-24 06:51:12 -08:00
vantienvnn
c0b2d8ad9d
Fixed #2615
2012-02-24 21:35:50 +07:00
ADmad
4edb378ef8
Added ability to pass ID as parameter to Model::exists()
2012-02-24 19:42:23 +05:30
Mark Story
fd927207c1
Merge pull request #524 from shama/patch-typos
...
Typo fixes in the tests
2012-02-23 17:11:08 -08:00
mark_story
ed22c17eba
Fix path in Testsuite.
2012-02-23 20:09:11 -05:00
Mark Story
56052b12ce
Merge pull request #522 from shama/patch-acl-test
...
Move DbAclTest, IniAclTest and Rename Model/DbAclTest
2012-02-23 17:02:18 -08:00
Ceeram
8eea263d71
fixing incorrect post data
2012-02-23 20:00:51 -05:00
Ceeram
9d71df475d
another attempy to set correc order for expected and result in assert, definitely time for some coffee
2012-02-23 20:00:43 -05:00
Kyle Robinson Young
4176e59e52
Typo fixes in tests
2012-02-23 15:29:53 -08:00
Kyle Robinson Young
ea652394c7
Move DbAcl and IniAcl into Acl subfolder and rename Model/DbAclTest to AclNodeTest
2012-02-23 10:45:32 -08:00
Mark Story
94db313e39
Merge pull request #516 from dogmatic69/tree-behavior-optimization
...
Tree behavior optimization
Fixes #2600
2012-02-23 09:27:41 -08:00
Mark Story
3a391529d2
Merge pull request #520 from dogmatic69/2610
...
Closes #2610
2012-02-23 09:26:11 -08:00
Ceeram
6d3c659260
fixed expected and result order in asserts, also added extra test
2012-02-23 12:24:31 -05:00
Ceeram
836f913a64
testcase for incorrect merge of post data
2012-02-23 12:24:26 -05:00
