mark_story
|
1aea9ac0c9
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
|
2012-10-15 21:46:49 -04:00 |
|
Adam Taylor
|
4090c2e932
|
Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
|
2012-10-15 18:19:37 -06:00 |
|
mark_story
|
513851d1c1
|
Update skel directory logging configuration.
|
2012-10-13 02:29:25 -04:00 |
|
mark_story
|
a3ae58da09
|
Merge branch 'master' into 2.3
Conflicts:
lib/Cake/View/View.php
|
2012-10-01 21:20:25 -04:00 |
|
mark_story
|
739b3b70f7
|
Update text in routes.php to clarify when to remove core routes.
|
2012-09-30 20:17:50 -04:00 |
|
euromark
|
3945c0e6a8
|
rtim files
|
2012-07-18 03:55:29 +02:00 |
|
mark_story
|
2f7f5e1322
|
Use file cache as the default cache engine.
Too many people had issues using APC by default as its often configured
in strange ways, and works poorly on inexpensive hosting.
Fixes #2995
|
2012-07-15 09:11:27 -04:00 |
|
Rachman Chavik
|
8e8763d69d
|
change to match syslog levels & customizable levels
|
2012-05-13 18:51:57 +07:00 |
|
Rachman Chavik
|
e5b33627d5
|
minor updates to the logging changeset
- change usage of Set to Hash
- updating bootstrap.php
- adding docblocks
- avoid silencing unlink errors in tests
|
2012-05-11 21:19:45 +07:00 |
|
Rachman Chavik
|
5c4f741529
|
add default logging config in Config/bootstrap.php
|
2012-05-11 12:37:00 +07:00 |
|
mark_story
|
b6de177ffa
|
Merge branch '2.1' into 2.2
|
2012-04-23 21:50:36 -04:00 |
|
Kyle Robinson Young
|
89d3221adc
|
Update available App::build settings in bootstrap
|
2012-04-22 21:16:00 -07:00 |
|
Jose Lorenzo Rodriguez
|
8465538800
|
Merge branch '2.2-middleware' into 2.2
|
2012-04-22 17:17:36 -04:30 |
|
Jose Lorenzo Rodriguez
|
826699a670
|
Extracting asset dispatcher and cache dispatcher into separate classes to provide examples on how to use Dispatcher
Filters
|
2012-04-17 00:42:18 -04:30 |
|
Juan Basso
|
9beaa9602f
|
Unified error handlers. Now the regular error handler will receive the fatal errors too.
|
2012-04-14 16:08:36 -04:00 |
|
Juan Basso
|
a72288c378
|
Fixing doc.
|
2012-04-14 16:08:36 -04:00 |
|
Juan Basso
|
05cdae6d1a
|
Renamed fatal error handler configuration for follow the same logic of consoleHandler name.
|
2012-04-14 16:08:36 -04:00 |
|
Juan Basso
|
1428659f88
|
Moved the fatal error detection to App::shutdown and keeping the fatal error handler cleaner. It helps to be extended by applications/plugins.
|
2012-04-14 16:08:35 -04:00 |
|
Juan Basso
|
c754fb2dcb
|
Updated copyright to 2012.
|
2012-03-12 22:46:46 -04:00 |
|
Juan Basso
|
3b1bd90ad6
|
Updated copyright to 2012.
|
2012-03-12 22:46:07 -04:00 |
|
mark_story
|
db8c6b5c78
|
Fix most of the coding standards issues in Console/
|
2012-03-03 18:55:29 -05:00 |
|
Rachman Chavik
|
b545d8b201
|
fix getSchemaName() for Sqlserver.
Closes #2609.
|
2012-02-23 08:25:07 +07:00 |
|
Kyle Robinson Young
|
22582aee63
|
Upgrade legacy uses of App::build() types
|
2012-02-18 04:31:29 -08:00 |
|
Graham Weldon
|
64d4387c82
|
Added default prefix to cache configurations.
|
2012-01-23 10:43:21 +11:00 |
|
Kyle Robinson Young
|
1e1c7a036d
|
Code consistency formatting tweaks
|
2011-12-06 12:52:48 -08:00 |
|
Kyle Robinson Young
|
94e119fe67
|
Adhere to code formatting standard
|
2011-11-30 23:21:31 -08:00 |
|
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 |
|
Gun.io Whitespace Robot
|
4742168253
|
Remove whitespace [Gun.io WhitespaceBot]
|
2011-10-28 18:25:08 -04:00 |
|
Majna
|
a9dbde0cbd
|
Fixing incorrect doc blocks regarding error handler.
|
2011-10-23 21:55:20 +02: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
|
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 |
|
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 |
|
Ceeram
|
22029a1199
|
fixing email.php.default, from should have email as key
|
2011-09-29 14:59:27 +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 |
|
ADmad
|
34d3d6fe9e
|
Fixing doc block related to session configuration. Closes #1927
|
2011-08-23 04:07:08 +05:30 |
|
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 |
|
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 |
|
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 |
|
Juan Basso
|
1c7d54eacc
|
Updated the paths from comments.
|
2011-06-19 20:28:40 -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 |
|
Juan Basso
|
21348169fa
|
Camelized templates folder.
|
2011-05-30 23:02:39 -04:00 |
|