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
|
edda41e23b
|
Removing 'altclass' from scaffold templates.
Refs #306
|
2011-06-22 13:08:17 -07:00 |
|
Mark Story
|
694819cb81
|
Fixing issue with generic.css and overlapping in view scaffolds.
Thanks to 'euromark' for the patch.
Fixes #1787
|
2011-06-21 22:28:25 -07:00 |
|
Mark Story
|
f641da89fa
|
Fixing issue with generic.css and overlapping in view scaffolds.
Thanks to 'euromark' for the patch.
Fixes #1787
Conflicts:
app/webroot/css/cake.generic.css
|
2011-06-21 22:28:03 -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 |
|
ADmad
|
cb946bbcf3
|
Added warning message on homepage for misconfigured URL rewriting. Removed dead link for cakeforge.org
|
2011-06-05 03:34:28 +05:30 |
|
Juan Basso
|
6f821e0d4d
|
Changes relatives to templates from last commit.
|
2011-05-30 23:11:09 -04:00 |
|
Juan Basso
|
6aca8dc11a
|
Updating the copyright to 2011.
|
2011-05-30 22:46:14 -04:00 |
|
Juan Basso
|
192812ee7f
|
Updating the copyright to 2011.
|
2011-05-30 22:32:43 -04:00 |
|
ADmad
|
6b7dbcdd1c
|
Adding warning message on homepage for misconfigured URL rewriting. Closes #1577
|
2011-05-26 20:35:28 +05:30 |
|
Juan Basso
|
acc0660989
|
Changed the emails folder in layouts to CamelCased. Fixes #1730.
|
2011-05-24 01:05:29 -04:00 |
|
Juan Basso
|
3812ac70cb
|
Fixed the default name of email transport. Fixes #1728.
|
2011-05-24 01:01:58 -04:00 |
|
Juan Basso
|
39320ef352
|
Renamed the Mssql driver to Sqlserver.
|
2011-05-22 23:19:13 -04:00 |
|
mark_story
|
600609cc87
|
Adding testsuite icons to the repo, so they are local assets instead of remote ones.
Fixes #1708
|
2011-05-22 09:15:04 -04:00 |
|
Leonid Mamchenkov
|
574cee7510
|
Fixed typo in documentation
|
2011-05-16 21:58:18 +03:00 |
|
AD7six
|
0508055ee9
|
remove CAKE_TEST_LIB constant
|
2011-05-15 17:36:39 +02:00 |
|
Jose Lorenzo Rodriguez
|
91bce16e9d
|
Merge remote-tracking branch 'origin/2.0' into 2.0-merge
Conflicts:
lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
lib/Cake/tests/Case/Log/Engine/FileLog.php
lib/Cake/tests/Case/Log/Engine/FileLogTest.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
|
2011-05-15 00:40:54 -04:30 |
|
mark_story
|
b6ef1305df
|
Backporting changes made to Memcache in 2.0 to address issues with persistent
connections. Refs #1705
|
2011-05-13 22:10:58 -04:00 |
|
Thomas Ploch
|
4aa9254316
|
Updated Memcache settings docblock in core.php (skel and config). Removed probably misleading comment about FCGI. Fixes #1705
|
2011-05-14 00:55:28 +02:00 |
|
Thomas Ploch
|
402c4a7a6f
|
Added 'persistent' setting to MemcacheEngine.
Fixes #1705 when connections are not closed when using i.e. FCGI.
|
2011-05-13 23:44:59 +02:00 |
|
Jose Lorenzo Rodriguez
|
3b725290ba
|
Renaming elements and layouts
|
2011-05-13 02:45:36 -04:30 |
|
Jose Lorenzo Rodriguez
|
ded3cb4826
|
Renaming more folders
|
2011-05-13 02:31:33 -04:30 |
|
Jose Lorenzo Rodriguez
|
900dfef2f7
|
Starting unification of casing in remaining folders
|
2011-05-13 01:53:49 -04:30 |
|
evilbloodydemon
|
1d7d20768f
|
Fixed typo in variable name
|
2011-04-26 21:44:37 +04:00 |
|
Juan Basso
|
24fbaafe01
|
Merge with 2.0-email.
|
2011-04-23 22:36:55 -04:00 |
|
Juan Basso
|
fac5ae50d0
|
Moved the emails templates from elements to views. Renamed the path in layouts to keep the same name. Fixes #1415.
|
2011-04-20 23:47:21 -04:00 |
|
Juan Basso
|
e0b4623065
|
Added support to sender email. Fixes #13.
|
2011-04-19 20:24:51 -04:00 |
|
AD7six
|
0c2bc7f015
|
bye bye webroot/css.php
|
2011-04-18 12:05:50 +02:00 |
|
Juan Basso
|
a1bcaa9d29
|
Created a static method to send fast emails.
|
2011-04-17 21:23:48 -04:00 |
|
Juan Basso
|
38f5d9da1f
|
Fixed issues related with email config.
|
2011-04-17 18:42:55 -04:00 |
|
Juan Basso
|
42ee001d71
|
Changed the classname of email config.
|
2011-04-17 18:42:55 -04:00 |
|
AD7six
|
3ff9747d02
|
sync app core.php with tempalte core.php
don't use apc on the cli unless it's enabled - which by default it is
not
|
2011-04-17 11:48:51 +02:00 |
|
Juan Basso
|
554d32e76d
|
Using the config from CakeEmail instead try to read from Configure class in email transports.
|
2011-04-12 22:17:30 -04:00 |
|
Juan Basso
|
daa90ed2b2
|
Created the email class and a logic in CakeEmail.
|
2011-04-12 22:17:28 -04:00 |
|
Jose Lorenzo Rodriguez
|
000e05b468
|
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
|
2011-04-11 22:48:08 -04:30 |
|
Jose Lorenzo Rodriguez
|
910b64fcec
|
Renaming folders in app tests
|
2011-04-10 21:00:51 -04:30 |
|
Ceeram
|
77730b0b9b
|
removed some more dead links to trac
|
2011-03-26 22:34:03 +01:00 |
|
Jose Lorenzo Rodriguez
|
6737380deb
|
Partial migration of folders to camelcase in app
|
2011-03-22 00:46:51 -04:30 |
|
AD7six
|
69ce628f07
|
fix file permissions
except for app/console/cake and lib/cake/Console/cake no files should
be executable
|
2011-03-16 16:06:44 +01:00 |
|
AD7six
|
39c7d03319
|
Merge branch '2.0-class-loading' into 2.0-translations
Conflicts:
lib/Cake/Console/Command/Task/ControllerTask.php
lib/Cake/Console/Command/Task/ProjectTask.php
lib/Cake/Core/Configure.php
lib/Cake/View/pages/home.ctp
|
2011-03-16 12:29:39 +01:00 |
|
Jose Lorenzo Rodriguez
|
3f7928fccc
|
Changing paths againg form datasources sub packages,
Updating database.php.default file
Fixing view generation task
|
2011-03-16 00:14:37 -04:00 |
|
Jose Lorenzo Rodriguez
|
8213160bb1
|
Udating template home.ctp and providing a default skel dir in tamplate task
|
2011-03-15 23:48:51 -04:00 |
|
Jose Lorenzo Rodriguez
|
0cd51de827
|
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
|
2011-03-12 23:49:02 -04:30 |
|
AD7six
|
dd40e7dbfa
|
use the 'cake' domain for any references in the app folder
|
2011-03-12 19:48:02 +01:00 |
|
mark_story
|
4efef1ed67
|
Moving the default cache configuration to app/config/bootstrap.php, as its not used by CakePHP anymore, and is an application configuration value.
|
2011-03-12 12:18:21 -05:00 |
|
mark_story
|
70d334f7eb
|
Moving core cache configuration out of Configure and into core.php.
This makes the cache configurations cake uses internally more
transparent, and easier for the end developer to configure. Fixes #1586
|
2011-03-12 11:24:59 -05:00 |
|
Jose Lorenzo Rodriguez
|
a1fe95e072
|
REverting some changes made to constants
|
2011-03-08 17:32:22 -04:30 |
|
Jose Lorenzo Rodriguez
|
2ef02ba29b
|
Starting to move all console related classes, ViewTask tests passing
|
2011-03-07 00:45:00 -04:30 |
|