Mark Story
4f67f84ff8
Merge branch '1.2' into 1.3-merger
...
Conflicts:
app/config/acl.ini.php
app/config/bootstrap.php
app/config/core.php
app/config/database.php.default
app/config/inflections.php
app/config/routes.php
app/config/schema/db_acl.php
app/config/schema/i18n.php
app/config/schema/sessions.php
app/config/sql/db_acl.sql
app/config/sql/i18n.sql
app/index.php
app/webroot/css.php
app/webroot/css/cake.generic.css
app/webroot/index.php
app/webroot/js/vendors.php
app/webroot/test.php
cake/LICENSE.txt
cake/basics.php
cake/bootstrap.php
cake/config/config.php
cake/config/paths.php
cake/config/unicode/casefolding/0080_00ff.php
cake/config/unicode/casefolding/0100_017f.php
cake/config/unicode/casefolding/0180_024F.php
cake/config/unicode/casefolding/0250_02af.php
cake/config/unicode/casefolding/0370_03ff.php
cake/config/unicode/casefolding/0400_04ff.php
cake/config/unicode/casefolding/0500_052f.php
cake/config/unicode/casefolding/0530_058f.php
cake/config/unicode/casefolding/1e00_1eff.php
cake/config/unicode/casefolding/1f00_1fff.php
cake/config/unicode/casefolding/2100_214f.php
cake/config/unicode/casefolding/2150_218f.php
cake/config/unicode/casefolding/2460_24ff.php
cake/config/unicode/casefolding/2c00_2c5f.php
cake/config/unicode/casefolding/2c60_2c7f.php
cake/config/unicode/casefolding/2c80_2cff.php
cake/config/unicode/casefolding/ff00_ffef.php
cake/console/cake
cake/console/cake.bat
cake/console/cake.php
cake/console/error.php
cake/console/libs/acl.php
cake/console/libs/api.php
cake/console/libs/bake.php
cake/console/libs/console.php
cake/console/libs/i18n.php
cake/console/libs/schema.php
cake/console/libs/shell.php
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/db_config.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/console/libs/tasks/plugin.php
cake/console/libs/tasks/project.php
cake/console/libs/tasks/test.php
cake/console/libs/tasks/view.php
cake/console/libs/templates/skel/config/bootstrap.php
cake/console/libs/templates/skel/config/inflections.php
cake/console/libs/templates/skel/config/sql/sessions.sql
cake/console/libs/templates/skel/index.php
cake/console/libs/templates/skel/views/elements/email/html/default.ctp
cake/console/libs/templates/skel/views/elements/email/text/default.ctp
cake/console/libs/templates/skel/views/layouts/ajax.ctp
cake/console/libs/templates/skel/views/layouts/default.ctp
cake/console/libs/templates/skel/views/layouts/email/html/default.ctp
cake/console/libs/templates/skel/views/layouts/email/text/default.ctp
cake/console/libs/templates/skel/webroot/js/vendors.php
cake/console/libs/templates/skel/webroot/test.php
cake/console/libs/templates/views/form.ctp
cake/console/libs/templates/views/index.ctp
cake/console/libs/testsuite.php
cake/console/templates/default/views/view.ctp
cake/console/templates/skel/app_controller.php
cake/console/templates/skel/app_helper.php
cake/console/templates/skel/app_model.php
cake/console/templates/skel/config/acl.ini.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/config/database.php.default
cake/console/templates/skel/config/routes.php
cake/console/templates/skel/config/schema/db_acl.php
cake/console/templates/skel/config/schema/db_acl.sql
cake/console/templates/skel/config/schema/i18n.php
cake/console/templates/skel/config/schema/i18n.sql
cake/console/templates/skel/config/schema/sessions.php
cake/console/templates/skel/config/schema/sessions.sql
cake/console/templates/skel/controllers/pages_controller.php
cake/console/templates/skel/views/layouts/flash.ctp
cake/console/templates/skel/webroot/css.php
cake/console/templates/skel/webroot/css/cake.generic.css
cake/console/templates/skel/webroot/index.php
cake/dispatcher.php
cake/libs/cache.php
cake/libs/cache/apc.php
cake/libs/cache/file.php
cake/libs/cache/memcache.php
cake/libs/cache/xcache.php
cake/libs/cake_log.php
cake/libs/cake_session.php
cake/libs/cake_socket.php
cake/libs/class_registry.php
cake/libs/configure.php
cake/libs/controller/app_controller.php
cake/libs/controller/component.php
cake/libs/controller/components/acl.php
cake/libs/controller/components/auth.php
cake/libs/controller/components/cookie.php
cake/libs/controller/components/email.php
cake/libs/controller/components/request_handler.php
cake/libs/controller/components/security.php
cake/libs/controller/components/session.php
cake/libs/controller/controller.php
cake/libs/controller/pages_controller.php
cake/libs/controller/scaffold.php
cake/libs/debugger.php
cake/libs/error.php
cake/libs/file.php
cake/libs/flay.php
cake/libs/folder.php
cake/libs/http_socket.php
cake/libs/i18n.php
cake/libs/inflector.php
cake/libs/l10n.php
cake/libs/magic_db.php
cake/libs/model/app_model.php
cake/libs/model/behaviors/acl.php
cake/libs/model/behaviors/containable.php
cake/libs/model/behaviors/translate.php
cake/libs/model/behaviors/tree.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/datasource.php
cake/libs/model/datasources/dbo/dbo_adodb.php
cake/libs/model/datasources/dbo/dbo_db2.php
cake/libs/model/datasources/dbo/dbo_firebird.php
cake/libs/model/datasources/dbo/dbo_mssql.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/model/datasources/dbo/dbo_odbc.php
cake/libs/model/datasources/dbo/dbo_oracle.php
cake/libs/model/datasources/dbo/dbo_postgres.php
cake/libs/model/datasources/dbo/dbo_sqlite.php
cake/libs/model/datasources/dbo/dbo_sybase.php
cake/libs/model/datasources/dbo_source.php
cake/libs/model/db_acl.php
cake/libs/model/model.php
cake/libs/model/model_behavior.php
cake/libs/multibyte.php
cake/libs/object.php
cake/libs/overloadable.php
cake/libs/overloadable_php4.php
cake/libs/overloadable_php5.php
cake/libs/router.php
cake/libs/sanitize.php
cake/libs/security.php
cake/libs/set.php
cake/libs/string.php
cake/libs/validation.php
cake/libs/view/elements/dump.ctp
cake/libs/view/elements/email/html/default.ctp
cake/libs/view/elements/email/text/default.ctp
cake/libs/view/errors/error404.ctp
cake/libs/view/errors/missing_action.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/helper.php
cake/libs/view/helpers/ajax.php
cake/libs/view/helpers/app_helper.php
cake/libs/view/helpers/cache.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/javascript.php
cake/libs/view/helpers/js.php
cake/libs/view/helpers/number.php
cake/libs/view/helpers/paginator.php
cake/libs/view/helpers/rss.php
cake/libs/view/helpers/session.php
cake/libs/view/helpers/text.php
cake/libs/view/helpers/time.php
cake/libs/view/helpers/xml.php
cake/libs/view/layouts/ajax.ctp
cake/libs/view/layouts/default.ctp
cake/libs/view/layouts/email/html/default.ctp
cake/libs/view/layouts/email/text/default.ctp
cake/libs/view/layouts/flash.ctp
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/theme.php
cake/libs/view/view.php
cake/libs/xml.php
cake/tests/cases/basics.test.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/schema.test.php
cake/tests/cases/console/libs/shell.test.php
cake/tests/cases/console/libs/tasks/extract.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/console/libs/tasks/test.test.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cache.test.php
cake/tests/cases/libs/cache/apc.test.php
cake/tests/cases/libs/cache/file.test.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/cache/xcache.test.php
cake/tests/cases/libs/cake_log.test.php
cake/tests/cases/libs/cake_session.test.php
cake/tests/cases/libs/cake_socket.test.php
cake/tests/cases/libs/cake_test_case.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/class_registry.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/acl.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/email.test.php
cake/tests/cases/libs/controller/components/request_handler.test.php
cake/tests/cases/libs/controller/components/security.test.php
cake/tests/cases/libs/controller/components/session.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/controller/controller_merge_vars.test.php
cake/tests/cases/libs/controller/pages_controller.test.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/debugger.test.php
cake/tests/cases/libs/error.test.php
cake/tests/cases/libs/file.test.php
cake/tests/cases/libs/flay.test.php
cake/tests/cases/libs/folder.test.php
cake/tests/cases/libs/http_socket.test.php
cake/tests/cases/libs/i18n.test.php
cake/tests/cases/libs/inflector.test.php
cake/tests/cases/libs/l10n.test.php
cake/tests/cases/libs/magic_db.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/behaviors/containable.test.php
cake/tests/cases/libs/model/behaviors/translate.test.php
cake/tests/cases/libs/model/behaviors/tree.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/model/connection_manager.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_adodb.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/dbo_oracle.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/model/db_acl.test.php
cake/tests/cases/libs/model/model.test.php
cake/tests/cases/libs/model/model_behavior.test.php
cake/tests/cases/libs/model/model_delete.test.php
cake/tests/cases/libs/model/model_integration.test.php
cake/tests/cases/libs/model/model_read.test.php
cake/tests/cases/libs/model/model_validation.test.php
cake/tests/cases/libs/model/model_write.test.php
cake/tests/cases/libs/model/models.php
cake/tests/cases/libs/multibyte.test.php
cake/tests/cases/libs/object.test.php
cake/tests/cases/libs/overloadable.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/sanitize.test.php
cake/tests/cases/libs/security.test.php
cake/tests/cases/libs/set.test.php
cake/tests/cases/libs/string.test.php
cake/tests/cases/libs/test_manager.test.php
cake/tests/cases/libs/validation.test.php
cake/tests/cases/libs/view/helper.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/cache.test.php
cake/tests/cases/libs/view/helpers/form.test.php
cake/tests/cases/libs/view/helpers/html.test.php
cake/tests/cases/libs/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/js.test.php
cake/tests/cases/libs/view/helpers/number.test.php
cake/tests/cases/libs/view/helpers/paginator.test.php
cake/tests/cases/libs/view/helpers/rss.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/cases/libs/view/helpers/text.test.php
cake/tests/cases/libs/view/helpers/time.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/view/theme.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/cases/libs/xml.test.php
cake/tests/fixtures/account_fixture.php
cake/tests/fixtures/aco_action_fixture.php
cake/tests/fixtures/aco_fixture.php
cake/tests/fixtures/aco_two_fixture.php
cake/tests/fixtures/advertisement_fixture.php
cake/tests/fixtures/another_article_fixture.php
cake/tests/fixtures/apple_fixture.php
cake/tests/fixtures/aro_fixture.php
cake/tests/fixtures/aro_two_fixture.php
cake/tests/fixtures/aros_aco_fixture.php
cake/tests/fixtures/aros_aco_two_fixture.php
cake/tests/fixtures/article_featured_fixture.php
cake/tests/fixtures/article_featureds_tags_fixture.php
cake/tests/fixtures/article_fixture.php
cake/tests/fixtures/articles_tag_fixture.php
cake/tests/fixtures/attachment_fixture.php
cake/tests/fixtures/auth_user_custom_field_fixture.php
cake/tests/fixtures/auth_user_fixture.php
cake/tests/fixtures/author_fixture.php
cake/tests/fixtures/basket_fixture.php
cake/tests/fixtures/bid_fixture.php
cake/tests/fixtures/binary_test_fixture.php
cake/tests/fixtures/book_fixture.php
cake/tests/fixtures/cache_test_model_fixture.php
cake/tests/fixtures/callback_fixture.php
cake/tests/fixtures/category_fixture.php
cake/tests/fixtures/category_thread_fixture.php
cake/tests/fixtures/cd_fixture.php
cake/tests/fixtures/comment_fixture.php
cake/tests/fixtures/content_account_fixture.php
cake/tests/fixtures/content_fixture.php
cake/tests/fixtures/counter_cache_post_fixture.php
cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
cake/tests/fixtures/counter_cache_user_fixture.php
cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
cake/tests/fixtures/data_test_fixture.php
cake/tests/fixtures/datatype_fixture.php
cake/tests/fixtures/dependency_fixture.php
cake/tests/fixtures/device_fixture.php
cake/tests/fixtures/device_type_category_fixture.php
cake/tests/fixtures/device_type_fixture.php
cake/tests/fixtures/document_directory_fixture.php
cake/tests/fixtures/document_fixture.php
cake/tests/fixtures/exterior_type_category_fixture.php
cake/tests/fixtures/feature_set_fixture.php
cake/tests/fixtures/featured_fixture.php
cake/tests/fixtures/film_file_fixture.php
cake/tests/fixtures/flag_tree_fixture.php
cake/tests/fixtures/fruit_fixture.php
cake/tests/fixtures/fruits_uuid_tag_fixture.php
cake/tests/fixtures/home_fixture.php
cake/tests/fixtures/image_fixture.php
cake/tests/fixtures/item_fixture.php
cake/tests/fixtures/items_portfolio_fixture.php
cake/tests/fixtures/join_a_b_fixture.php
cake/tests/fixtures/join_a_c_fixture.php
cake/tests/fixtures/join_a_fixture.php
cake/tests/fixtures/join_b_fixture.php
cake/tests/fixtures/join_c_fixture.php
cake/tests/fixtures/join_thing_fixture.php
cake/tests/fixtures/message_fixture.php
cake/tests/fixtures/my_categories_my_products_fixture.php
cake/tests/fixtures/my_categories_my_users_fixture.php
cake/tests/fixtures/my_category_fixture.php
cake/tests/fixtures/my_product_fixture.php
cake/tests/fixtures/my_user_fixture.php
cake/tests/fixtures/node_fixture.php
cake/tests/fixtures/number_tree_fixture.php
cake/tests/fixtures/number_tree_two_fixture.php
cake/tests/fixtures/numeric_article_fixture.php
cake/tests/fixtures/overall_favorite_fixture.php
cake/tests/fixtures/person_fixture.php
cake/tests/fixtures/portfolio_fixture.php
cake/tests/fixtures/post_fixture.php
cake/tests/fixtures/posts_tag_fixture.php
cake/tests/fixtures/primary_model_fixture.php
cake/tests/fixtures/product_fixture.php
cake/tests/fixtures/project_fixture.php
cake/tests/fixtures/sample_fixture.php
cake/tests/fixtures/secondary_model_fixture.php
cake/tests/fixtures/session_fixture.php
cake/tests/fixtures/something_else_fixture.php
cake/tests/fixtures/something_fixture.php
cake/tests/fixtures/stories_tag_fixture.php
cake/tests/fixtures/story_fixture.php
cake/tests/fixtures/syfile_fixture.php
cake/tests/fixtures/tag_fixture.php
cake/tests/fixtures/test_plugin_article_fixture.php
cake/tests/fixtures/test_plugin_comment_fixture.php
cake/tests/fixtures/the_paper_monkies_fixture.php
cake/tests/fixtures/thread_fixture.php
cake/tests/fixtures/translate_article_fixture.php
cake/tests/fixtures/translate_fixture.php
cake/tests/fixtures/translate_table_fixture.php
cake/tests/fixtures/translated_article_fixture.php
cake/tests/fixtures/translated_item_fixture.php
cake/tests/fixtures/unconventional_tree_fixture.php
cake/tests/fixtures/underscore_field_fixture.php
cake/tests/fixtures/user_fixture.php
cake/tests/fixtures/uuid_fixture.php
cake/tests/fixtures/uuid_tag_fixture.php
cake/tests/fixtures/uuid_tree_fixture.php
cake/tests/fixtures/uuiditem_fixture.php
cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
cake/tests/fixtures/uuidportfolio_fixture.php
cake/tests/groups/acl.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/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_reporter.php
cake/tests/lib/cake_test_case.php
cake/tests/lib/cake_test_fixture.php
cake/tests/lib/cake_test_model.php
cake/tests/lib/cake_web_test_case.php
cake/tests/lib/cli_reporter.php
cake/tests/lib/code_coverage_manager.php
cake/tests/lib/templates/footer.php
cake/tests/lib/templates/header.php
cake/tests/lib/templates/menu.php
cake/tests/lib/templates/simpletest.php
cake/tests/lib/test_manager.php
cake/tests/lib/xdebug.php
cake/tests/test_app/config/acl.ini.php
cake/tests/test_app/controllers/tests_apps_controller.php
cake/tests/test_app/controllers/tests_apps_posts_controller.php
cake/tests/test_app/models/behaviors/persister_one_behavior.php
cake/tests/test_app/models/behaviors/persister_two_behavior.php
cake/tests/test_app/models/comment.php
cake/tests/test_app/models/persister_one.php
cake/tests/test_app/models/persister_two.php
cake/tests/test_app/models/post.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/tests_controller.php
cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.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/shells/example.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/plugins/test_plugin_two/vendors/shells/example.php
cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.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/html/default.ctp
cake/tests/test_app/views/elements/email/text/default.ctp
cake/tests/test_app/views/elements/email/text/wide.ctp
cake/tests/test_app/views/layouts/ajax.ctp
cake/tests/test_app/views/layouts/ajax2.ctp
cake/tests/test_app/views/layouts/cache_layout.ctp
cake/tests/test_app/views/layouts/default.ctp
cake/tests/test_app/views/layouts/email/html/default.ctp
cake/tests/test_app/views/layouts/email/html/thin.ctp
cake/tests/test_app/views/layouts/email/text/default.ctp
cake/tests/test_app/views/layouts/flash.ctp
cake/tests/test_app/views/layouts/multi_cache.ctp
cake/tests/test_app/views/posts/sequencial_nocache.ctp
cake/tests/test_app/views/posts/test_nocache_tags.ctp
index.php
2010-01-26 17:54:34 -05:00
Mark Story
66a8910810
Fixing cakephp domain name.
2010-01-26 17:15:15 -05:00
Mark Story
cdd87849cc
Fixing @link tags to ease merging.
2010-01-26 17:03:03 -05:00
Mark Story
527eec1a54
Fixing doc tags to make merge easier.
2010-01-26 16:51:53 -05:00
Mark Story
98749a5a2b
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
...
Conflicts:
cake/libs/folder.php
2010-01-25 11:18:44 -05:00
Mark Story
85b193048d
Fixing ConsoleShell's use of Router. Fixes #236
2010-01-20 10:47:04 -05:00
Mark Story
f11068b831
Trimming trailing whitespace from files. Refs #201
2010-01-15 13:26:47 -05:00
Mark Story
f2cc41bb3a
Fixing php4 issues for AclShell test case.
2010-01-14 22:15:14 -05:00
Mark Story
8f2a4a1e0e
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-01-14 20:28:00 -05:00
Mark Story
5c47d8dd7a
Trimming trailing whitespace from files. Refs #201
2010-01-14 20:15:54 -05:00
Joël Perras
15b8a3ec71
Updating copyright date on all files.
2010-01-13 23:47:14 -05:00
Mark Story
619f9210f3
Removing orphaned method.
2010-01-13 21:55:32 -05:00
Juan Basso
5149d65c7e
Adding redirect to baked controllers so when no delete could be done an
...
error page is not displayed.
Fixes #188
Signed-off-by: Mark Story <mark@mark-story.com>
2010-01-11 18:07:29 -05:00
Mark Story
4a96f52be9
Refactoring testsuite shell and consolidating duplicated filename generation logic.
2010-01-11 18:04:38 -05:00
Mark Story
980a85cec4
Updating testsuite shell to use new CodeCoverage methods.
2010-01-10 15:55:09 -05:00
Mark Story
f4bda62ea3
Adding doc blocks and correcting constructor of CakeCliReporter
...
Fixing TestSuite console code coverage output.
2010-01-09 23:00:03 -05:00
Mark Story
081509a09c
Fixing typos.
...
Removing useless constant.
Fixing constructor
2010-01-09 21:30:46 -05:00
Mark Story
696af91aa0
Refactoring testsuite shell features, and adding i18n text.
2010-01-09 21:25:05 -05:00
Mark Story
80670d85fb
Updating TestSuite shell to use refactored classes and methods in the TestSuite.
2010-01-09 20:20:51 -05:00
Mark Story
1e0215b7c1
Correcting whitespace.
2010-01-09 19:44:50 -05:00
Mark Story
a9a8c0b0e4
Adding access tags and additional param/return docs.
2009-12-29 22:50:43 -05:00
Mark Story
fdd8cf0138
Making FixtureTask always refresh schema for models.
2009-12-29 22:39:49 -05:00
Mark Story
31fff5e390
Making ViewTask always refresh model schema so baked views reflect current schema.
2009-12-29 22:23:52 -05:00
Mark Story
ec88bd9c8c
Forcing ModelTask to always reload schema for models when baking. Also setting the dbo's cacheSources = false so table listings are always fresh as well.
2009-12-29 22:23:03 -05:00
Mark Story
780e85a031
Refactoring ModelTask::_confirmAssociations() so it doesn't fail with $i counter.
2009-12-15 23:14:03 -05:00
Mark Story
76780ab99c
Updating uses of Routing.admin to be Routing.prefixes, as Routing.admin is deprecated.
2009-12-08 23:52:02 -05:00
predominant
8b9ee22c84
Removing "Long description for file" from /cake/console tree.
2009-12-08 20:18:19 +11:00
mark_story
dd4fbbab45
Updating PluginTask to create webroot dir and no longer create vendors/css, vendors/js and vendors/img
2009-11-25 22:50:50 -05:00
mark_story
d758dbc343
Updating cake.generic.css to let .altrow class to apply to dd and dt elements. Fixes #361
2009-11-24 19:57:20 -05:00
mark_story
8cdee90b4f
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/libs/view/helpers/html.php
2009-11-22 21:28:14 -05:00
mark_story
4d37e75f18
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/extract.php
cake/console/libs/tasks/model.php
cake/libs/configure.php
cake/libs/controller/components/cookie.php
cake/libs/debugger.php
cake/libs/flay.php
cake/libs/http_socket.php
cake/libs/inflector.php
cake/libs/model/cake_schema.php
cake/libs/model/connection_manager.php
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo_source.php
cake/libs/router.php
cake/libs/view/helper.php
cake/libs/view/helpers/form.php
cake/libs/view/helpers/html.php
cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
ceeram
cd6fd74caf
Added -empty flag for ProjectTask to bake with empty dir files, tests included
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-22 18:18:14 -05:00
Juan Basso
1c0c1bc9c7
Replace function split by explode when possible.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:45:04 -05:00
Juan Basso
df9e1e0bd1
Replace function join (alias) by implode.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:43:11 -05:00
Juan Basso
1acc60b04c
Replace function die (alias) by exit.
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-21 13:38:11 -05:00
mark_story
89558dc4af
Fixing issues with models using default inflected tables instead of their actual tables when detecting associations. Fixes #315
2009-11-16 09:24:52 -05:00
mark_story
ddb9f8924c
Updating i18n shell to use updated schema shell api.
2009-11-16 09:12:41 -05:00
mark_story
acd2c15690
Merge branch '1.3-misc' into 1.3-merger
...
Conflicts:
cake/tests/cases/libs/configure.test.php
2009-11-15 20:09:12 -05:00
mark_story
0783176238
Replacing duplicated code with pluginSplit().
...
Updating test case.
2009-11-15 19:55:20 -05:00
mark_story
ea6e3dd076
Fixing issue with bake model <name>
2009-11-15 16:47:58 -05:00
mark_story
e1d60368f6
Adding missing reference operator.
2009-11-15 16:38:15 -05:00
predominant
0977b3fe15
Standardising docblock endings throughout.
2009-11-14 23:19:25 +11:00
mark_story
13f9b79dc9
Removing console/libs/templates. Has been moved in 1.3 and a merge with 1.2 added it again.
2009-11-13 09:15:31 -05:00
mark_story
38f578199d
Changing new Model() for ClassRegistry::init(). Fixes issues when baking admin and non-admin methods for a controller that uses bound translations + TranslateBehavior. Fixes #245
2009-11-12 09:32:45 -05:00
mark_story
61d56cd275
Changing order of text in project task.
...
Making ProjectTask::getPrefix silent when interactive = false.
Making ProjectTask silent from View task if all or a controller name is provided.
2009-11-11 09:56:35 -05:00
mark_story
0d37beca75
Removing duplicate variable assignment.
2009-11-10 09:23:43 -05:00
mark_story
b39b38aac9
Adding missing variable.
...
Adding Test case for previous commit.
2009-11-10 09:17:54 -05:00
mark_story
2af5318e7a
Moving import in ModelTask to fix issue running bake model all.
2009-11-09 23:54:59 -05:00
mark_story
adaa2b689c
Adding test case for previous commit.
...
Fixing function for non-windows paths.
2009-11-09 20:10:24 -05:00
ceeram
c810b3cde4
Making ProjectTask bake constants with DS instead of hardcoded / or \.
...
Makes developing/deploying to mixed systems easier.
refs #278
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-09 18:58:21 -05:00
ceeram
d251a1d5ca
Adding config() call to ensure that DATABASE_CONFIG has been
...
loaded before attempting to use it.
refs #277
Signed-off-by: Mark Story <mark@mark-story.com>
2009-11-09 18:55:37 -05:00
mark_story
c4b493c934
Manually merging changes from ModelTask in 1.2 to FixtureTask
...
Adding test cases for FixtureTask.
2009-11-08 22:22:08 -05:00
mark_story
7981b44db4
Merge branch '1.3-misc' into mergers
2009-11-08 21:39:55 -05:00
mark_story
95cafc7138
Adding missing help text.
2009-11-08 13:46:45 -05:00
predominant
1185681549
Removing newline caused by Subversion line removal.
2009-11-06 18:01:22 +11:00
predominant
384bb7a0e0
Update license lines throughout.
2009-11-06 17:51:51 +11:00
predominant
d7b604c8ed
Fixing links throughout
2009-11-06 17:46:59 +11:00
predominant
8ff6505fe8
Removing excess whitespace
2009-11-06 17:08:23 +11:00
predominant
6782cb019c
Update CakePHP Project link.
2009-11-06 17:00:11 +11:00
predominant
5dfe1777af
Removing Subversion file headers.
2009-11-06 16:51:09 +11:00
predominant
ceee56013c
Remove Subversion $Date$ lines.
2009-11-06 16:17:01 +11:00
predominant
04f1b6cdfe
Remove Subversion $LastChangedBy$ lines.
2009-11-06 16:11:16 +11:00
predominant
42f3f16d60
Remove subversion $Revision$ lines.
2009-11-06 16:08:02 +11:00
predominant
1b9b0aae5e
Updating Copyright date to include 2009.
2009-11-06 15:34:28 +11:00
predominant
8f75ff58c7
Removing @filesource
2009-11-06 15:24:02 +11:00
mark_story
b4f6dd9c6e
Adding tests and support for binary columns in model task. Fixes #241
2009-11-04 22:57:43 -05:00
mark_story
5f1d090bf0
Adding import()s to DbConfigTask and ModelTask to fix missing class errors, when methods are run in certain orders.
2009-11-04 13:21:05 -05:00
mark_story
f81d3da175
Moving import to fix issue where cakeschema would not be found when baking models.
2009-11-04 12:59:32 -05:00
mark_story
1d22adbc1a
Merge branch '1.3-misc' into 1.3
2009-11-03 22:50:11 -05:00
renan.saddam
5ebdc88223
Fixing declaration of @access property.
2009-11-02 21:54:03 -02:00
mark_story
a3bb77c4f3
Merge branch '1.2' into 1.3-merger
...
Conflicts:
cake/console/libs/acl.php
cake/console/libs/tasks/controller.php
cake/console/libs/tasks/db_config.php
cake/console/libs/tasks/model.php
cake/console/libs/templates/skel/views/layouts/xml/default.ctp
cake/libs/model/datasources/dbo/dbo_mysql.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/validation.php
cake/libs/view/helpers/form.php
cake/tests/cases/basics.test.php
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/cake_test_case.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/view/helpers/javascript.test.php
cake/tests/cases/libs/view/helpers/session.test.php
cake/tests/groups/controller.group.php
cake/tests/groups/lib.group.php
cake/tests/groups/no_database.group.php
2009-11-01 12:11:49 -05:00
mark_story
e6c58e8030
Fixing wierd workflows in bake when project baking was aborted, it would ask if you wanted to create a database config file for the aborted app.
2009-10-30 22:08:06 -04:00
mark_story
ad8cba41e6
Merge branch '1.3' into 1.3-misc
2009-10-30 22:04:20 -04:00
mark_story
bc26a6ab67
Updating fixture task to change when CakeSchema is loaded to fix issues with errors being generated when baking new projects.
...
Fixes #226
2009-10-30 22:03:23 -04:00
Gordon Pettey
2e3bbe363d
Array coding convention and extraneous punctuation
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-10-30 16:38:27 -04:00
renan.saddam
df8895a266
Adding a optinal parameter and question for merge action. Refs #147 .
2009-10-29 21:26:59 -02:00
mark_story
1e7c2bbfde
Adding libs dir generation to PluginTask. Baked plugins now come with a libs dir.
2009-10-28 09:21:42 -04:00
mark_story
3b391e30df
Adding help text for new -records flag in the FixtureTask
2009-10-28 08:26:52 -04:00
mark_story
102f10365f
Implementing -records flag to enable quick access to building fixtures off of live data. Refs #196
2009-10-24 14:32:56 -04:00
mark_story
857b7c2399
Merge branch '1.3' into fixture-task
2009-10-24 14:08:16 -04:00
mark_story
72830cb125
Adding test case for model task
...
Fixing missing case for float datatypes when generating fixtures.
Fixes #204
2009-10-24 11:26:06 -04:00
mark_story
6847d34d80
Updating fixture test to fix issues caused by refactoring in CakeSchema.
2009-10-22 13:11:30 -04:00
mark_story
1ee9771efb
Removing ife() from AclShell. Refs #6562
2009-10-21 13:12:03 -04:00
mark_story
0657afcf30
Removing use of low() from core classes. Refs #6525
2009-10-21 13:03:24 -04:00
mark_story
0cc1d84737
Removing use of e() from core and test suite.
2009-10-21 12:57:03 -04:00
mark_story
957be00d2e
Adding return to Shell::out() and ShellDispatcher::stdout(). They now return the number of bytes written to stdout. Fixes #164
2009-10-15 00:23:54 -04:00
mark_story
2f81c29def
Updating $pluginPath loops to use App::pluginPath().
2009-10-14 09:47:07 -04:00
mark_story
a3f38c77dd
Merge branch '1.3-console' into 1.3
2009-10-11 21:51:02 -04:00
mark_story
7d4bc20fbd
Updating model to reflect changes in Validation.
2009-10-11 21:35:06 -04:00
mark_story
4b862de085
Fixing interactions with Routing.prefixes in Controller and View task.
2009-10-07 01:35:29 -04:00
mark_story
1110f3e1c2
Updating Validation method extraction.
2009-10-07 00:51:55 -04:00
mark_story
651a3f16b2
Updating ProjectTask::getAdmin(). Renamed to ProjectTask::getPrefix(). Now returns the user selected prefix to use for baking.
...
Test cases updated. Use of method updated.
2009-10-07 00:46:13 -04:00
mark_story
5021d11124
Updating the help() for bake task to include information about plugin shortcuts.
2009-10-04 17:59:12 -04:00
mark_story
b15471095b
Updating the help file for schema shell.
2009-10-04 15:12:05 -04:00
mark_story
2dc0fbf3b3
Making schema dump work with plugins.
...
Adding tests.
Making output of dump file more flexible.
2009-10-04 14:47:35 -04:00
mark_story
75f2106420
Made SchemaShell::view() work better with plugins. Tests added.
2009-10-04 14:06:07 -04:00
mark_story
30ef7960ac
Removing method that is no longer needed.
2009-10-04 13:39:43 -04:00
mark_story
05f6099def
Enabling plugin.name schema file creation and addition.
...
Making CakeSchema::load() use plugin parameter, tests added.
Plugin schema file added to test_app.
2009-10-04 13:32:33 -04:00
mark_story
c2a53d3c69
Removing cake schema run
. Replacing it with cake schema create
and cake schema update
. Removes extra typing and simplifies schema shell commands.
...
Updating test cases.
2009-10-04 11:16:23 -04:00
mark_story
e1d0be610c
Splitting help() into more readable format.
2009-10-04 10:24:15 -04:00
mark_story
76a88fc477
Updating help() for Schema shell.
2009-10-04 10:04:48 -04:00
mark_story
0fc6f58cfb
Refactoring and merging duplicated code between CakeSchema and FixtureTask
2009-10-03 16:15:56 -04:00
mark_story
71aa460a48
Continuing work on getting plugin support for CakeSchema and SchemaShell. Applied patch from 'SkieDr', test cases added.
2009-10-03 11:48:02 -04:00
mark_story
58ec259714
Merge branch '1.3-router' into 1.3-misc
2009-09-30 00:51:20 -04:00
SkieDr
86d0a04c8d
fixture generator for new table and field level parameters
2009-09-29 22:54:43 +04:00
mark_story
f0276414ad
Fixing out() from merge
2009-09-27 16:28:26 -04:00
mark_story
bc90f0aa01
Merge branch '1.3-console' into 1.3
...
Conflicts:
cake/console/libs/tasks/fixture.php
2009-09-27 16:26:45 -04:00
davidpersson
7fc14f47b3
Updating formatting.
2009-09-26 23:41:42 +02:00
davidpersson
ccbc6f35f0
Updating all calls to Shell::out().
2009-09-26 23:08:37 +02:00
davidpersson
0f6bca7496
Making first parameter of Shell::out() and err() optional.
2009-09-26 23:02:54 +02:00
mark_story
c330934b93
Adding test cases for view task.
2009-09-23 13:27:47 -04:00
José Lorenzo Rodríguez
6dd144b3cf
Adding getTemplate to view task
...
Signed-off-by: Mark Story <mark@mark-story.com>
2009-09-23 13:13:58 -04:00
mark_story
32198c58d0
Removing date validation suggestion for datetime fields. Fixes #106
2009-09-22 18:49:30 -04:00
davidpersson
86274357b9
Updating Shell class to use nl() where possible.
2009-09-21 23:01:43 +02:00
davidpersson
5ac7361a76
Removing support for string input in Shell::nl().
...
Updating Shell::out() and Shell::err() parameter usage.
Updating method to always return strings, renaming parameter.
Updating docblocks.
Updating test.
2009-09-21 22:39:45 +02:00
mark_story
42017e95c6
Merge branch '1.3-console' into 1.3
...
Conflicts:
cake/tests/cases/console/libs/schema.test.php
2009-09-20 19:05:03 -04:00
mark_story
a3cd80bf52
Merge branch '1.3-bake' into 1.3
2009-09-20 17:42:43 -04:00
mark_story
9b7a10a4bc
Applying patch from 'michaelc' to optimize to Shell::out()
2009-09-19 00:20:40 -04:00
mark_story
5717e3b59c
Merge branch '1.2' into 1.2-merger
...
Conflicts:
app/webroot/test.php
cake/VERSION.txt
cake/bootstrap.php
cake/config/config.php
cake/console/cake.php
cake/console/libs/schema.php
cake/console/templates/skel/webroot/test.php
cake/libs/configure.php
cake/tests/cases/console/libs/schema.test.php
cake/tests/cases/libs/debugger.test.php
cake/tests/cases/libs/model/model_write.test.php
cake/tests/fixtures/aco_fixture.php
2009-09-16 01:23:49 -04:00
renan.saddam
78e01cdb47
Refactoring ExtractTask to support extraction from multi-directories and splitting domain in different files.
2009-09-15 00:43:59 -03:00
mark_story
326424592d
Merge branch '1.2' into 1.2-merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/dispatcher.php
cake/libs/controller/scaffold.php
cake/libs/inflector.php
cake/libs/view/view.php
cake/tests/cases/libs/controller/scaffold.test.php
cake/tests/cases/libs/inflector.test.php
cake/tests/cases/libs/view/view.test.php
cake/tests/fixtures/counter_cache_post_fixture.php
cake/tests/fixtures/counter_cache_user_fixture.php
2009-09-13 13:52:58 -04:00
renan.saddam
7c100f3b75
Fixing notice error message. Fixes #34
2009-09-10 23:26:54 -03:00
mark_story
036bb620fa
Removing error flags from test.php.
2009-09-07 16:13:25 -04:00
nate
b2d13fce40
Moving error flags to core bootstrap to avoid extra changes in user files, fixing error in previous commit.
2009-09-07 15:12:39 -04:00
mark_story
12e0652943
Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2
2009-09-07 14:47:53 -04:00
nate
a5c00de3bd
Applying PHP 5.3 compatibility patch from. Please update your config/core.php, webroot/index.php and webroot/test.php accordingly.
2009-09-07 14:25:22 -04:00
jperras
24351b5a21
Backporting bugfix for #22 from 1.3-console to 1.2. Adds schema shell test cases, fixes for schema object references, i18n of schema schell output strings.
2009-09-07 12:24:38 -04:00
mark_story
b8d3aae474
Fixing path to home page template.
2009-09-06 01:04:38 -04:00
mark_story
24448775c2
Removing use of r() from core classes.
2009-08-27 23:08:23 -04:00
mark_story
30f8709bb4
Removing use of low() in core classes and functions. Refs #6525
2009-08-27 22:46:00 -04:00
mark_story
98c2801d00
Applying patch to clarify Schema error message. Fixed #5337
2009-08-27 22:24:44 -04:00
mark_story
98ad480bf2
Fixing error string passing in SchemaShell::__run() Fixes #45
2009-08-21 22:33:33 -04:00
mark_story
ae715ef882
Adding in fallback for sql & schema dirs.
...
Starting to add plugin support for schema shell.
tests added.
2009-08-20 01:07:21 -04:00
AD7six
7c4dfed299
Updating view and controller tasks to use (_singluar|_plural)HumanName functions
...
Modifying the test case to expect humanized forms
2009-08-19 10:17:10 +02:00
mark_story
34b6e18e8d
Adding help() for TestTask.
2009-08-16 21:32:10 -04:00
mark_story
a7499be154
Adding missing & operators.
...
Adding tests for run update.
Adding -f param to schema run update to allow for testing and forcing of table comparison. Skips model checks and uses tables only instead.
2009-08-14 20:06:27 -04:00
mark_story
dc4cfc59eb
Updating fileheader.
2009-08-14 18:06:38 -04:00
gwoo
368c7556d4
Merge branch '1.3-console' into 1.3
2009-08-14 12:32:54 -04:00
mark_story
ae628f7f72
Applying patch from 'savant' Fixes usage of deprecated methods. Fixes #11
2009-08-12 09:46:18 -04:00
mark_story
dfa9ccdaf9
Adding Test case option to bake main menu.
2009-08-12 09:46:17 -04:00
mark_story
267fcc1c81
Adding F as an option to bake menu.
2009-08-12 09:46:17 -04:00
mark_story
31d136ca67
Making constructClasses() call run against the correct object. test cases updated.
...
Fixes #4
2009-08-12 09:46:17 -04:00
mark_story
b731408deb
Fixing constant use in ProjectTask.
...
Fixing newline.
2009-08-12 09:46:17 -04:00
mark_story
29d03ab722
Adding __() to ProjectTask
2009-08-12 09:46:17 -04:00
mark_story
74448e4dee
Adding test cases for run create in Schema shell.
2009-08-10 21:54:29 -04:00
mark_story
dd1075a330
Adding i18n to schema shell.
2009-08-10 21:38:09 -04:00
jperras
9363a61c32
Unifying case for single-letter interactive shell input, most notably SchemaShell, which previously failed on uppercase interactive input.
2009-08-10 19:47:41 -04:00
mark_story
f70b97f4cb
Adding more tests for generate().
2009-08-08 23:46:00 -04:00
mark_story
3c46b51b7f
Adding test cases for startup()
2009-08-07 22:19:40 -04:00
mark_story
2cc8ae631e
Fixing notice error when non-existant node type is used.
...
Fixing view() so you can view a slice of the tree.
2009-08-07 08:32:27 -04:00