mark_story
c28cde4e56
Update webroot files to fix an issue in ServerShell.
...
The previous fixes done in 2918ae9c7a
caused other issues preventing actions from being dispatched properly.
Fixes #3934
2013-07-27 17:01:35 -04:00
ADmad
6da0a37e11
Merge pull request #1453 from Phally/2.4-merge
...
Merge master => 2.4
2013-07-26 22:20:14 -07:00
Phally
a70e004cda
Corrects bad merge.
...
Bad merge: d161b21ae1
Fixes #3938 .
2013-07-26 20:00:32 +02: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
Christian Winther
b345a8f180
Merge pull request #1451 from Phally/master-3922
...
Strips the base off the generated URL from the AuthComponent.
2013-07-26 06:23:58 -07:00
Phally
f7eab23a5c
Strips the base off the generated URL from the AuthComponent.
...
Fixes #3922 .
2013-07-26 15:18:28 +02:00
David Gallagher
5937685817
Use ModelValidator::count() to count dynamiclly added validation rules
2013-07-26 22:44:59 +10:00
euromark
8b21710c95
whitespace correction
2013-07-25 13:26:21 +02:00
ADmad
802228f1d1
Merge pull request #1448 from dereuromark/2.4-remove-private
...
remove private in favor of protected visibility
2013-07-24 06:19:42 -07:00
euromark
24fa926ff9
remove private in favor of protected visibility
2013-07-22 21:08:05 +02:00
Christian Winther
5993ac39de
Merge pull request #1447 from Phally/master-bootstrap
...
Paths for App::build() require trailing /.
2013-07-22 05:37:50 -07:00
Phally
881e757a1e
Paths for App::build() require trailing /.
2013-07-22 13:51:09 +02:00
Christian Winther
1b3b4e6508
Merge pull request #1445 from Phally/master-3895-2
...
Fixes cake bake all. Refs #1443 .
2013-07-20 11:35:57 -07:00
Phally
5953171c7b
Fixes cake bake all. Refs #1443 .
2013-07-20 20:21:35 +02:00
Mark Story
09c21c5aa6
Merge pull request #1443 from Phally/master-3895
...
Replaces deprecated paginate() calls in controller bake templates.
2013-07-20 10:36:09 -07:00
Phally
6d6be87f8f
Replaces deprecated paginate() calls in controller bake templates.
...
Fixes #3895 .
2013-07-20 16:59:39 +02:00
mark_story
2d2721d2d9
Update docs for MySQL
...
MySQL supports a few non-standard options. Document them.
2013-07-19 23:01:16 -04:00
mark_story
8913f4fc08
Merge branch 'ssl_pdo_mysql' into 2.4
...
Merge pull request #1421 from mikescar/ssl_pdo_mysql
Fixes #556
2013-07-19 22:57:05 -04:00
Mike Scarborough
c780ded512
add SSL support to MySQL PDO connections
2013-07-19 22:56:51 -04: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
Mark Story
2f2fba3b39
Merge pull request #1437 from Phally/master-apc-errors
...
Fixes errors in tests with APC installed but not enabled in CLI.
2013-07-19 09:26:22 -07:00
Phally
36cac116d0
Fixes errors in tests with APC installed but not enabled in CLI.
2013-07-19 17:04:54 +02:00
Mark
c5e3bbec29
Merge pull request #1435 from Phally/2.4-paginatorhelpertest
...
Test case that proves #1432 .
2013-07-18 11:07:59 -07: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
5769217ef9
Merge pull request #1433 from dereuromark/2.4-user-agent-session
...
Always create user agent hash in session
2013-07-18 07:05:10 -07:00
Mark Story
59498b4e16
Merge pull request #1434 from dereuromark/2.4-bake-force
...
2.4 bake force
2013-07-18 06:47:51 -07:00
euromark
0b6919ee94
force option for bake tasks (view, model, controller, test, fixture)
2013-07-18 13:09:00 +02:00
euromark
7a1a3e593d
Always create user agent hash in session
2013-07-18 12:02:42 +02: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
717b1ded00
Update version number to 2.3.8
2013-07-17 22:15:15 -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
Mark
aa18a53d25
Merge pull request #1429 from cakephp/2.4-timeagoinwords
...
fix test case
2013-07-17 03:54:54 -07: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
Mark Story
72508cb260
Merge pull request #1423 from dereuromark/2.4-timeagoinwords
...
2.4 timeagoinwords
2013-07-16 20:31:25 -07:00
mark_story
a8f4ec0450
Simplify whitelist logic.
2013-07-16 19:33:06 -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
304b54fe7d
wording
2013-07-16 15:18:14 +02:00
euromark
13ee5b7338
ability to provide custom strings for timeAgoInWords()
2013-07-16 15:16:30 +02:00