Rachman Chavik
90af608489
keep existing data in unique HABTM closes LH 275
...
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:09:02 +07:00
mark_story
2e8498e166
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Console/TaskCollectionTest.php
lib/Cake/Test/Case/Model/ModelIntegrationTest.php
lib/Cake/Test/Case/Utility/ClassRegistryTest.php
lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -08: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
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
Majna
87a3937def
Add visibility keyword for 'helpers' property in controller template.
2011-11-30 20:06:07 +01: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
Rachman Chavik
fa80be50eb
Removing timestamp lines from generated files
...
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
2011-11-25 08:45:33 +07:00
ADmad
233a63366f
Syncing files between app directory and bake skeleton
2011-11-14 02:32:59 +05:30
Renan Gonçalves aka renan.saddam
2a33bc862a
Merge pull request #296 from majna/2.0-dbconfig-task
...
Fix for 'datasource' key when baking another db config.
2011-11-07 01:58:54 -08:00
Kyle Robinson Young
b2414a777f
Remove 5.3 notice from lib/Cake/Console/Templates/skel/Config/core timezone comment
2011-11-06 13:17:07 -08:00
Majna
1b9b90d2e7
Replacing 'driver' with 'datasource'.
2011-11-04 23:07:31 +01:00
Marko Marković
385f6f164f
Fixed typos in css
2011-11-01 16:59:11 +01:00
Gun.io Whitespace Robot
4742168253
Remove whitespace [Gun.io WhitespaceBot]
2011-10-28 18:25:08 -04:00
mark_story
8529d76e6f
Removing Xml prolog from default xml layouts.
...
Both DOMDocument and SimpleXML output the prolog when
saving xml.
Fixes #2171
2011-10-27 20:58:03 -04:00
m
5a5a542a71
Missing ini_set of include path for test.php
...
Fixes #2167
Signed-off-by: mark_story <mark@mark-story.com>
2011-10-25 22:26:59 -04:00
mark_story
d92c73d821
Remove reference to XmlHelper.
...
Refs #2164
2011-10-25 20:16:58 -04:00
Majna
a9dbde0cbd
Fixing incorrect doc blocks regarding error handler.
2011-10-23 21:55:20 +02:00
Rachman Chavik
a60d71d19b
removing 'empty' files from nonempty directories
2011-10-19 12:19:28 +07:00
Rachman Chavik
2bb93761cc
fixing typos
2011-10-19 12:19:28 +07:00
mark_story
d7155d374b
Making apc feature test rely on apc_dec.
...
ZCS comes with a busted apc, and we need apc_dec to properly
use the ApcEngine anyways.
Fixes #2105
2011-10-18 20:48:58 -04:00
Jose Lorenzo Rodriguez
e47b970811
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-10-16 15:45:47 -04:30
Jose Lorenzo Rodriguez
b38c0e50a4
Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
...
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
Renan Gonçalves
d2a664c2df
Fixing @package at in Cake/Console/Templates/skel files.
2011-10-15 20:30:49 +02:00
Renan Gonçalves
507eb2f653
Fixing @package at in Cake/Console/Templates files.
2011-10-15 20:26:48 +02:00
Jose Lorenzo Rodriguez
f8772dc524
Also changing shell script in skel directory
2011-10-15 10:18:36 -04:30
Jose Lorenzo Rodriguez
36fa2e87b4
Adding symlink support to the cake console executable
2011-10-14 22:15:26 -04:30
mark_story
6bf6d79979
Removing 'cake' domain from core.
...
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.
Fixes #2103
2011-10-14 21:01:17 -04:00
Heath Nail
9e9b1f0382
Windows newlines for .bat files.
2011-10-14 15:31:09 -04:00
Heath Nail
36162621cf
Incresing sync between app and skel directories.
2011-10-14 15:28:38 -04:00
Heath Nail
ce4acda25b
Incresing sync between app and skel directories.
2011-10-14 15:06:36 -04:00
evilbloodydemon
8e78308261
Removed unnecessary ClassRegistry::flush() from test template.
2011-10-12 13:37:50 +04:00
Majna
a5220fa7bb
Fixed doc block comments.
2011-10-11 00:22:23 +02:00
mark_story
3f778d8936
Fix inconsistency between app and skel directory.
...
Fixes #2077
2011-10-08 14:40:11 -04:00
mark_story
e07256b6d4
Update the .htaccess files to increase
...
compatibility with shared hosting servers.
Fixes #2010
2011-10-07 20:59:20 -04:00
ADmad
fa214e8716
Updating old usage Configure::read()
to new Configure::read('debug')
. Closes #2070
2011-10-06 17:02:15 +05:30
mark_story
2cc9523509
Adding old webkit gradient prefixes.
...
Fixes #2066
2011-10-05 17:59:39 -04:00
mark_story
aae2b0c257
Fixing issue baking controller tests.
...
During interactive controller baking, controller tests
would be generated with the wrong filename.
During interactive baking fixtures would not be detected.
Fixes #2052
2011-10-02 22:53:37 -04:00
Graham Weldon
f69fc937cb
Fixed missing string append operator for baked homepage to include banner.
2011-10-02 11:58:11 +11:00
Ceeram
22029a1199
fixing email.php.default, from should have email as key
2011-09-29 14:59:27 +02:00
mark_story
8272758eb9
Adding block to home page for PHP version.
...
Fixes #2010
2011-09-24 10:41:22 -04:00
Renan Gonçalves
1b2b191212
Updating cake.generic.css to its newest version from app directory.
2011-09-20 20:29:55 +02:00
ADmad
7c87e9abc1
For MySQL you can now specify the socket to use using unix_socket
key in the config array. Closes #1994
2011-09-16 13:40:04 +05:30
mark_story
3cb3424b4f
Add App::uses to baked controllers.
...
Controllers should load their dependencies.
Bake should help with the best practice.
Fixes #1971
2011-09-09 20:43:04 -04:00
mark_story
7c08c966b0
Adding App::uses() call to model baking.
...
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
2011-09-09 20:43:04 -04:00
mark_story
3d44489b0c
Deprecating the %page% style placeholders in PaginatorHelper.
...
Updating scaffold and bake templates to not use deprecated placeholders.
2011-09-06 02:37:43 +01:00
Jose Lorenzo Rodriguez
2bca1435ab
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-09-03 07:05:48 -04:30
Jose Lorenzo Rodriguez
89b1e54071
Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version
2011-09-03 06:50:19 -04:30
mark_story
8c75488979
More changes to the CSS, and updating the bake templates and scaffolds.
2011-09-03 10:06:01 +01:00
Juan Basso
7d0250ff47
Merge branch '2.0-api-doc' into 2.0
2011-08-26 20:22:26 -04:00