Graham Weldon
64d4387c82
Added default prefix to cache configurations.
2012-01-23 10:43:21 +11:00
Jose Lorenzo Rodriguez
b9ad469a65
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-01-22 15:52:54 -04:30
Yusuke Ando
b8d67e581a
Set encoding in CSS file.
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-22 11:34:16 -05:00
mark_story
df5d9ac3d1
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/Model.php
lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
Mark Story
8608caa8a2
Merge pull request #298 from vitorpc/2.0
...
Property 'name' removed of PagesController.
2012-01-17 18:52:26 -08:00
Ceeram
9f40e6de79
move AppShell to app/Console/Command directory
2012-01-12 11:55:10 +01:00
mark_story
0b0a69de1e
Update default layouts to use blocks.
2011-12-17 22:23:37 -05: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
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
Vitor Pacheco
2b5b7694c9
Property 'name' removed of PagesController.
2011-11-05 15:25:41 -02: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
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
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
Ceeram
22029a1199
fixing email.php.default, from should have email as key
2011-09-29 14:59:27 +02: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
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
Juan Basso
7d0250ff47
Merge branch '2.0-api-doc' into 2.0
2011-08-26 20:22:26 -04:00
ADmad
34d3d6fe9e
Fixing doc block related to session configuration. Closes #1927
2011-08-23 04:07:08 +05:30
Juan Basso
620a65b2fc
Merge branch '2.0' into 2.0-api-doc
...
Conflicts:
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
d93c8cb200
Merge branch '1.3' into merger
...
Conflicts:
cake/libs/controller/components/security.php
cake/libs/view/pages/home.ctp
cake/libs/view/view.php
lib/Cake/Cache/Engine/FileEngine.php
lib/Cake/Config/config.php
lib/Cake/Model/Datasource/Database/Postgres.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
lib/Cake/Test/Case/Utility/SetTest.php
lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
Majna
826001adc7
Added doc blocks for WincacheEngine. Fixed Memcache doc block.
2011-08-10 16:55:05 +02:00
Mark Story
b45e8eb0cd
Adding comments about CAKE_CORE_INCLUDE_PATH.
...
Removing ini_set() blocks that don't need to exist.
2011-08-03 20:06:47 -04:00
Mark Story
20e9015f80
Making skel files generate hard coded paths, when CakePHP
...
is not on the include_path, and exclude hard coded paths when it is.
2011-08-03 20:06:47 -04:00
Mark Story
721c438817
Re-adding support for PHP's include_path.
...
Moving constants that are made of other constants into bootstrap.php
2011-08-03 20:06:47 -04:00
Ceeram
dbdc0a1e37
moving test icons one dir up, and remove subdir img in img
2011-08-02 14:56:03 +02:00
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Mark Story
4101388069
Syncing skel directory with app/Config.
2011-07-22 20:29:45 -04:00
mark_story
2141b494cd
Adding charset as it was previously omitted.
2011-07-22 20:29:44 -04:00
mark_story
ec40ce6aad
Updating index.php and skel dir for response change.
2011-07-22 20:29:43 -04:00
Jose Lorenzo Rodriguez
feb567d4ee
Adding better help and documentation for loading plugins. The exception renderer will serve a helpful page if a plugin is missing
2011-07-07 02:34:22 -04:30
Mark Story
91a1cf81f3
Merge branch '1.3' into merger
...
Conflicts:
app/Config/acl.ini.php
app/config/database.php.default
app/webroot/css.php
app/webroot/css/cake.generic.css
cake/basics.php
cake/bootstrap.php
cake/config/paths.php
cake/console/cake.php
cake/console/error.php
cake/console/libs/acl.php
cake/console/libs/bake.php
cake/console/libs/i18n.php
cake/console/libs/shell.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/plugin.php
cake/console/libs/tasks/project.php
cake/console/libs/testsuite.php
cake/console/templates/default/classes/test.ctp
cake/console/templates/default/views/home.ctp
cake/console/templates/default/views/view.ctp
cake/console/templates/skel/config/database.php.default
cake/console/templates/skel/views/elements/email/text/default.ctp
cake/console/templates/skel/webroot/css.php
cake/dispatcher.php
cake/libs/cache.php
cake/libs/cake_session.php
cake/libs/configure.php
cake/libs/controller/component.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/email.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/controller.php
cake/libs/controller/scaffold.php
cake/libs/error.php
cake/libs/magic_db.php
cake/libs/model/behaviors/acl.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/model/model_behavior.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/router.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/errors/missing_behavior_class.ctp
cake/libs/view/errors/missing_behavior_file.ctp
cake/libs/view/errors/missing_component_class.ctp
cake/libs/view/errors/missing_component_file.ctp
cake/libs/view/errors/missing_connection.ctp
cake/libs/view/errors/missing_controller.ctp
cake/libs/view/errors/missing_helper_class.ctp
cake/libs/view/errors/missing_helper_file.ctp
cake/libs/view/errors/missing_layout.ctp
cake/libs/view/errors/missing_model.ctp
cake/libs/view/errors/missing_scaffolddb.ctp
cake/libs/view/errors/missing_table.ctp
cake/libs/view/errors/missing_view.ctp
cake/libs/view/errors/private_action.ctp
cake/libs/view/errors/scaffold_error.ctp
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/javascript.php
cake/libs/view/helpers/js.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/xml.php
cake/libs/view/media.php
cake/libs/view/pages/home.ctp
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/index.ctp
cake/libs/view/scaffolds/view.ctp
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/console/libs/acl.test.php
cake/tests/cases/console/libs/api.test.php
cake/tests/cases/console/libs/bake.test.php
cake/tests/cases/console/libs/shell.test.php
cake/tests/cases/console/libs/tasks/controller.test.php
cake/tests/cases/console/libs/tasks/db_config.test.php
cake/tests/cases/console/libs/tasks/fixture.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/console/libs/tasks/plugin.test.php
cake/tests/cases/console/libs/tasks/project.test.php
cake/tests/cases/console/libs/tasks/test.test.php
cake/tests/cases/console/libs/tasks/view.test.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cache/apc.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/code_coverage_manager.test.php
cake/tests/cases/libs/configure.test.php
cake/tests/cases/libs/controller/component.test.php
cake/tests/cases/libs/controller/components/auth.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/session.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/controller/pages_controller.test.php
cake/tests/cases/libs/error.test.php
cake/tests/cases/libs/http_socket.test.php
cake/tests/cases/libs/magic_db.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/test_manager.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/view/media.test.php
cake/tests/cases/libs/view/theme.test.php
cake/tests/cases/libs/xml.test.php
cake/tests/fixtures/aco_fixture.php
cake/tests/fixtures/translate_fixture.php
cake/tests/groups/acl.group.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/cache.group.php
cake/tests/groups/components.group.php
cake/tests/groups/configure.group.php
cake/tests/groups/console.group.php
cake/tests/groups/controller.group.php
cake/tests/groups/database.group.php
cake/tests/groups/helpers.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/model.group.php
cake/tests/groups/no_cross_contamination.group.php
cake/tests/groups/routing_system.group.php
cake/tests/groups/socket.group.php
cake/tests/groups/test_suite.group.php
cake/tests/groups/view.group.php
cake/tests/groups/xml.group.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/cake_test_model.php
cake/tests/lib/cake_test_suite_dispatcher.php
cake/tests/lib/cake_web_test_case.php
cake/tests/lib/code_coverage_manager.php
cake/tests/lib/reporter/cake_base_reporter.php
cake/tests/lib/reporter/cake_cli_reporter.php
cake/tests/lib/reporter/cake_text_reporter.php
cake/tests/lib/templates/menu.php
cake/tests/lib/templates/simpletest.php
cake/tests/lib/test_manager.php
cake/tests/test_app/controllers/tests_apps_controller.php
cake/tests/test_app/libs/cache/test_app_cache.php
cake/tests/test_app/libs/library.php
cake/tests/test_app/libs/log/test_app_log.php
cake/tests/test_app/plugins/test_plugin/config/load.php
cake/tests/test_app/plugins/test_plugin/config/more.load.php
cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
cake/tests/test_app/vendors/Test/MyTest.php
cake/tests/test_app/vendors/Test/hello.php
cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
cake/tests/test_app/vendors/shells/sample.php
cake/tests/test_app/vendors/somename/some.name.php
cake/tests/test_app/vendors/welcome.php
cake/tests/test_app/views/elements/email/text/default.ctp
cake/tests/test_app/views/layouts/default.ctp
cake/tests/test_app/views/posts/test_nocache_tags.ctp
lib/Cake/Cache/Engine/MemcacheEngine.php
lib/Cake/Config/config.php
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
lib/Cake/Console/Templates/skel/webroot/test.php
lib/Cake/Console/cake.bat
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Log/CakeLog.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
lib/Cake/Test/test_app/View/Emails/html/custom.ctp
lib/Cake/Test/test_app/View/Emails/text/custom.ctp
lib/Cake/TestSuite/templates/header.php
lib/Cake/Utility/Sanitize.php
lib/Cake/Utility/Validation.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
Mark Story
0e09f75a66
Updating table styles.
2011-06-22 13:53:38 -07:00
Mark Story
7392902abd
Syncing skel CSS with app/webroot css.
2011-06-22 13:17:38 -07:00
Juan Basso
1c7d54eacc
Updated the paths from comments.
2011-06-19 20:28:40 -04:00
Mark Story
aee5ee5fe5
Merge pull request #119 from neterslandreau/2.0
...
Merging changes for skel files.
2011-06-13 17:53:17 -07:00
Niles
d5012f0e33
add required uses to template.
2011-06-13 10:18:59 -04:00
Renan Gonçalves
564bf87764
Using exit instead of die, as did in 2e8bbd5e
.
...
Fixing an typo.
Using i18n on test.php file and pointing it to right directory.
2011-06-12 23:12:22 +02:00
Renan Gonçalves
2a3f49bf00
Updating the cake.generic.css from skeleton template to match the changes made on commit cb946bbc
.
2011-06-12 22:42:22 +02:00
Niles
1079889d9f
fix missing uses command in bake template. fixes #1770 .
2011-06-12 11:54:47 -04:00
Juan Basso
21348169fa
Camelized templates folder.
2011-05-30 23:02:39 -04:00