ADmad
b7cee8ff57
Ensure Configure::boostrap() doesn't overwrite existing configs under 'App' key.
...
Fixes #3874
2013-07-31 17:24:36 +05:30
Mark Story
4c7bc11a08
Merge pull request #1461 from thegallagher/master
...
Required fields not recognised by FormHelper when only using ModelValidator::add()
2013-07-29 18:33:28 -07:00
David Gallagher
37ab0611ae
Fix whitespace
2013-07-30 11:26:49 +10:00
David Gallagher
35cc737261
Add for required fields when using only ModelValidator::add()
2013-07-30 11:11:49 +10:00
Mark Story
7269568ae6
Merge pull request #1460 from ravage84/cakeschematest-setup+teardown
...
Removed unused setup & teardown methods
2013-07-28 17:54:33 -07:00
Marc Würth
3a4f7815e8
Removed unused setup & teardown methods from MyAppSchema in CakeSchemaTest
2013-07-29 01:55:32 +02:00
Marc Würth
1cac1846a3
Added missing calls to setUp & tearDown in tests
2013-07-29 01:52:39 +02:00
mark_story
8a81903e37
Fix FileEngine not clearing keys when groups are used.
...
Fixes #3930
2013-07-27 22:20:40 -04:00
mark_story
17b25388b3
Throw exceptions when '' is used as translation domain.
...
'' is never a good translation domain and often indicates developer
error. Treat it as a mistake and throw an exception.
Fixes #3939
2013-07-27 21:41:22 -04:00
mark_story
76aab0a635
Add failing test for #3930
2013-07-27 17:15:15 -04:00
Phally
933013f808
Test case to prove base urls are stripped.
...
Refs #3938 , #3916 .
2013-07-26 19:57:12 +02:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
Phally
f7eab23a5c
Strips the base off the generated URL from the AuthComponent.
...
Fixes #3922 .
2013-07-26 15:18:28 +02:00
euromark
8b21710c95
whitespace correction
2013-07-25 13:26:21 +02:00
euromark
24fa926ff9
remove private in favor of protected visibility
2013-07-22 21:08:05 +02:00
Phally
5953171c7b
Fixes cake bake all. Refs #1443 .
2013-07-20 20:21:35 +02:00
Phally
6d6be87f8f
Replaces deprecated paginate() calls in controller bake templates.
...
Fixes #3895 .
2013-07-20 16:59:39 +02:00
Mark Story
1402796047
Merge pull request #1441 from ravage84/ViewTestsCleanup
...
Added missing test + minor cleanup of ViewTests.php
2013-07-19 19:40:09 -07:00
Marc Würth
da8e50a48a
Added missing test + minor cleanup of ViewTests.php
...
Added missing block reset test through assign().
Also made some minor cleanup in ViewTests.php. Mostly docblocks (params, returns) but also some unused variables.
2013-07-20 01:43:07 +02:00
Phally
db1876d837
Adds order to the test models to make the results more predictable.
...
Even though there was some code in place to prevent results in random
order from PostgreSQL we were still experiencing this with Jenkins
and Travis.
This commit removes the old code that handled this. From now on this
will be handled differently. Every test model will order by its
primary key. You can disable this by changing the order property
of the model to `null`: `$testModel->order = null`.
2013-07-19 22:31:09 +02:00
Phally
36cac116d0
Fixes errors in tests with APC installed but not enabled in CLI.
2013-07-19 17:04:54 +02:00
Phally
32b818d2d8
Fixes bug in the first link of PaginatorHelper::numbers().
...
The link was the current URL instead of a link to the first
page. This only happened with named parameters. This commit
also includes a test for querystring parameters.
Refs #1432 .
2013-07-18 19:32:41 +02:00
mark_story
f725779a17
Better support various ranges as described in RFC2616
...
Refs #3914
2013-07-18 11:26:55 -04:00
mark_story
3f9e8e8113
Add missing calls to parent.
2013-07-18 11:04:09 -04:00
mark_story
e03d3df0fe
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/View/HelperTest.php
lib/Cake/VERSION.txt
2013-07-17 22:40:09 -04:00
Mark Story
204fb4b864
Merge pull request #1428 from markstory/2.4-location
...
2.4 location
2013-07-17 18:19:13 -07:00
Christian Winther
4416f2e796
Merge pull request #1427 from dereuromark/2.4-paginator-page1
...
fixes #700
2013-07-17 09:26:08 -07:00
mark_story
7b5122adb1
Fix pluralization of Objective.
...
Fixes #3921
2013-07-17 10:04:29 -04:00
mark_story
6c18f6a231
Add failure messages to test assertions.
2013-07-17 09:47:10 -04:00
euromark
22d6625872
fix test
2013-07-17 12:18:06 +02:00
mark_story
2df873412c
Add CakeResponse::location()
...
This method provides an easy to use interface to get/set the location
header in a response object. This is primarily to facilitate future
development in 3.x
2013-07-16 23:38:57 -04:00
euromark
05415dd83f
do not display page:1 or ?page=1 to avoid duplicate content in paginator helper output
2013-07-17 00:45:27 +02:00
mark_story
d4db64ff26
Ignore asset requests containing %2e in them.
...
urldecode URI's early to avoid issues with encoded `.` characters.
2013-07-16 13:14:27 -04:00
mark_story
b873186468
Fix being unable to sort on custom synthetic columns.
...
If a sort field whitelist is used we should trust its data and also
trust that the developer wanted what they asked for. This solves issues
where it was impossible to sort on synthetic columns added in custom
find types.
Fixes #3919
2013-07-16 10:19:18 -04:00
euromark
b412e2cbb1
provide ability for rounding - closes #1986
2013-07-16 15:42:08 +02:00
euromark
13ee5b7338
ability to provide custom strings for timeAgoInWords()
2013-07-16 15:16:30 +02:00
mark_story
4d6258adeb
Correct off by one error.
...
Refs #3914
2013-07-15 21:48:03 -04:00
Christian Winther
532b2099e5
Merge pull request #1410 from Phally/2.x-3814
...
LH#3814 CakeNumber::toPercentage() should return percentage
2013-07-15 10:44:41 -07:00
Adam Taylor
5a6f1259e3
Fix the "testAssetUrlNoRewrite" test
...
When running the test in the browser from somewhere other than
http://localhost (e.g. http://foo.dev ), the test was failing.
2013-07-13 23:38:55 -06:00
ADmad
d161b21ae1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
Majna
1ce9fc537f
Pages controller should render 404 on missing view file
2013-07-13 17:41:16 +02:00
mark_story
e016f1156f
Revert previous changes.
...
Adding this parameter was a mistake. Remove it.
2013-07-12 21:37:22 -04:00
mark_story
52be365598
Introduce the strip
argument to Router.
...
This allows callers to request that the basepath *not* be stripped off
when normalizing string URL's. This is important in AuthComponent when
handling redirect URL's as the redirect location could point to
a controller that shares a name with the base path.
Refs #3897
Refs #3916
2013-07-12 21:16:18 -04:00
Mark
f9fdc1e6e0
Merge pull request #1408 from dereuromark/master-cleanup
...
remove @access and unnecessary $name
2013-07-12 07:10:23 -07:00
mark_story
494fd05de6
Fix downloading Ranges in files.
...
Correctly handle ranges that don't terminate at the end of the file.
Also reject invalid ranges as described in RFC-2616.
Thanks to Kim Biesbjerg for the initial patch.
Fixes #3914
2013-07-11 23:20:12 -04:00
Mark Story
d992d3a626
Merge pull request #1385 from LeaseWeb/2.4
...
Add option to send email attachment from string (not only from file).
2013-07-10 10:12:07 -07:00
Mark Story
1ecc921e13
Merge pull request #1412 from wernerhp/master
...
Inflector pluralize and singularize update
2013-07-10 08:59:03 -07:00
Werner Pieterson
3d83c628eb
Added more words to InflectorTest
2013-07-10 17:49:18 +02:00
Werner Pieterson
a27499d88a
Updated Inflector's 'pluralize and singularize to correctly handle addisional words.
...
Updated InflectorTest to test new words.
2013-07-10 17:46:01 +02:00
Phally
e35bd80dfb
Adds option to multiply decimal percentages. Fixes #3814
2013-07-10 14:37:57 +02:00