Commit graph

12371 commits

Author SHA1 Message Date
mark_story
545f4d2811 Fix bad merge. 2011-12-03 13:56:55 -05:00
m
73de68f5f4 Test suite should display current PHPUnit version.
Fixes #2316
2011-12-03 13:47:40 -05:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
mark_story
22352a0227 Fix missing directory in dispatcher with rewrite off.
When re-writing is disabled, and the deployment directory
contains either 'app' or 'webroot' the computed path was
incorrect.

Fixes #2330
2011-12-02 23:39:33 -05:00
Mark Story
d4fd1b3743 Merge pull request #348 from petteyg/apptheme
Make TemplateTask prioritize App templates over Core templates
2011-12-02 17:28:01 -08:00
Mark Story
f58d28abd4 Merge pull request #350 from shama/patch-controller-test-case
Always set ControllerTestCase::testAction result variables
2011-12-02 17:22:13 -08:00
Kyle Robinson Young
4174ddff0f Always set ControllerTestCase::testAction result variables 2011-12-02 06:19:15 -08:00
José Lorenzo Rodríguez
ff8eb2bcca Merge pull request #349 from shama/patch-spelling
Spelling and grammar fixes
2011-12-01 22:08:33 -08:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
Gordon Pettey (petteyg)
a800dcbbca Merge branch 'master' into apptheme 2011-12-02 02:29:43 +00:00
mark_story
0f71254fe1 Fix double inflection in bake all <foo>
ViewTask re-pluralizes the model name.  Sometimes this leads to
things like Menuses which is totally wrong.

Fixes #2318
2011-12-01 20:41:17 -05:00
mark_story
8b3c72f7c1 Fix issue with nested named parameters.
Nested named parameters were not being correctly flattened.

Fixes #2329
2011-12-01 20:32:28 -05:00
mark_story
79d6a850ad Fix theme files with spaces in them.
Fixes #2324
2011-12-01 18:16:01 -05:00
Ceeram
faddfbe2d0 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-12-01 20:30:45 +01:00
Ceeram
0a1772c929 adding default name, for dbs that dont expose a PK 2011-12-01 20:30:36 +01:00
ceeram
95e8f1d8b2 Merge pull request #345 from shama/patch-standards
Adhere to code formatting standard
2011-11-30 23:58:27 -08:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
mark_story
49708ec837 Fix cachefiles being generated with "
Cache files with SQLite should not contain "

Fixes #2323
2011-11-30 21:56:25 -05:00
mark_story
65b87af6c0 Adding set to autoloader.
Fixes #2319
2011-11-30 21:14:39 -05:00
mark_story
4b292b139e Fix build, I'm a dork. 2011-11-30 21:00:07 -05:00
ADmad
166e03e7de Merge pull request #344 from majna/2.0-controller-template
Add visibility keyword for 'helpers' property in controller template.
2011-11-30 11:18:52 -08:00
Majna
87a3937def Add visibility keyword for 'helpers' property in controller template. 2011-11-30 20:06:07 +01:00
Ceeram
b5c4b85601 Fixing cascading delete, when using foreignKey false and setting condition on hasOne. 2011-11-30 20:02:36 +01:00
Mark Story
87a8af420f Merge pull request #343 from shama/patch-standards
Adhering to coding standards
2011-11-30 08:26:47 -08:00
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
José Lorenzo Rodríguez
32a3737cca Merge pull request #342 from shama/patch-doc
Add @link to helper docblocks
2011-11-29 21:56:08 -08:00
Kyle Robinson Young
1d50562931 Add @link to docblocks on Form, Html, Js, Paginator, Rss and Session helpers 2011-11-29 21:23:02 -08:00
mark_story
7f68699fcd Fix return values in Cache.
The documentation indicates that false/or the value will be returnned.
Using both null and false to indicate failure is confusing.  Use only
false to indicate failure.  It might be better in the future to use
exceptions for trying to read/write on missing cache configs.
2011-11-29 23:17:17 -05:00
mark_story
992a1554e1 Fix incorrect alias/name usage.
Fixes #2317
2011-11-29 20:44:30 -05:00
Renan Gonçalves
8568ac6613 Trying to take into account the number of days in a month. 2011-11-30 01:14:39 +01:00
Graham Weldon
af2e7c1e9b Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-11-29 23:00:47 +11:00
ADmad
c653d8361f Merge pull request #341 from andraskende/master
removing $i as its no longer being used here.
2011-11-28 23:59:39 -08:00
Andras Kende
4f64a9f6cd removing $i as its no longer being used here. (probably was used before on zebra striping.) 2011-11-28 23:33:55 -06:00
Jose Lorenzo Rodriguez
76e334ca38 Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-28 22:30:36 -04:30
Mark Story
8dd9846676 Merge pull request #335 from rchavik/remove-timestamp-lines
Removing timestamp lines from generated files
2011-11-28 18:46:37 -08:00
mark_story
a56ad0ccac Fixing failing tests. 2011-11-28 21:36:44 -05:00
mark_story
168c6f14c2 Checking types before calling methods. 2011-11-28 21:36:13 -05:00
Ceeram
57a1a2814d Fixing modeltask to use correct table
ModelTask will now bake correct primaryKey when not id
2011-11-29 00:00:00 +01:00
Jose Lorenzo Rodriguez
1668067740 Releasing 2.0.4 2011-11-28 11:20:58 -04:30
Renan Gonçalves aka renan.saddam
3efc728185 Merge pull request #337 from teddyzeenny/patch-view-caching
Patch for view caching - Helper serialization
2011-11-28 04:21:26 -08:00
teddyzeenny
803e7be363 Apply base64 encoding after helper serialization 2011-11-28 14:02:39 +02:00
teddyzeenny
a4aaaff53a Escape single quotes after Helper serialization 2011-11-28 13:15:23 +02:00
Jose Lorenzo Rodriguez
8f1125ed4d Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-11-28 00:54:16 -04:30
Jose Lorenzo Rodriguez
f6534d2962 Fixing issue where changing the case for an action in the url would allow the action in the AuthComponent making it accessible to not-logged in users 2011-11-28 00:52:47 -04:30
mark_story
cff980b45d Call parent::__construct so helpers are available. 2011-11-27 23:51:50 -05:00
mark_story
6e1b1df2b2 Change serialize to _serialize
Its possible that a developer would use 'serialize' as a legitimate
view variable.  Prefix with an _ to minimize that.
2011-11-27 23:51:49 -05:00
mark_story
04463c4ee5 Fix errors found in review. 2011-11-27 23:51:49 -05:00
mark_story
50ec08f9bd Adding support for array serialize values.
Using an array for 'serialize' gives a set of view vars
to convert into the view output.
2011-11-27 23:51:49 -05:00
mark_story
d9482fef25 Limit what exceptionrenderer outputs.
The exception object should not be part of production errors.
2011-11-27 23:51:49 -05:00
mark_story
b0d0e06b97 Update RequestHandler tests for new View classes. 2011-11-27 23:51:49 -05:00