AD7six
35b4ac0286
make it possible to run this test on its own
...
Without setting up paths to the test_app - two of the tests will fail
Verify/demonstrate how to mock a model without a model existing
2013-08-03 16:00:04 +00:00
AD7six
46b28aae50
merge config in getMockForModel
...
Otherwise, to override just one key, it's necessary to set all the other
defaults too
2013-08-03 16:00:04 +00:00
Andy Dawson
f34388c53a
Merge pull request #1471 from cakephp/feature/2.4-pretty-print
...
pretty print json and xml responses in debug mode
2013-08-03 01:35:56 -07:00
euromark
a5531f7419
fix casing
2013-08-03 04:32:39 +02:00
Mark Story
bbd46c9a86
Merge pull request #1473 from ADmad/feature/deprecate-consoleshell
...
Feature/deprecate consoleshell
2013-08-02 18:26:40 -07:00
ADmad
a2e818e509
Deprecated ConsoleShell
2013-08-03 03:04:32 +05:30
AD7six
1643e10c74
pretty print json and xml responses in debug mode
2013-08-02 15:17:24 +00:00
Andy Dawson
d7bc432202
Merge pull request #1468 from cakephp/feature/fix-console
...
Fix the console cli
2013-08-02 04:22:21 -07:00
Christian Winther
dc5cd988aa
Merge pull request #1467 from ADmad/feature/assets-url-config
...
Feature/assets url config
2013-08-02 01:21:37 -07:00
mark_story
5bd45ec65d
Fix double printing of models in ConsoleShell.
...
Fixes #3952
2013-08-01 08:50:02 +00:00
AD7six
69be4bb1e8
Update the console shell for easier maintenance
2013-08-01 08:39:01 +00:00
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
ADmad
b22b39f158
Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.
2013-07-31 18:31:26 +05:30
José Lorenzo Rodríguez
48df85d80d
Merge pull request #1466 from ADmad/bugfix/#3874
...
Ensure Configure::boostrap() doesn't overwrite existing configs under 'A...
2013-07-31 05:31:25 -07:00
ADmad
b7cee8ff57
Ensure Configure::boostrap() doesn't overwrite existing configs under 'App' key.
...
Fixes #3874
2013-07-31 17:24:36 +05:30
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
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
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