mark_story
33afe21aa7
Updating version numbers to 1.3.8
2011-03-20 16:10:00 -04:00
mark_story
9f583097f0
Updating version numbers for 1.3.7
2011-01-19 15:10:53 -05:00
mark_story
4c3337598e
Updating version numbers for 1.3.6
2010-11-13 20:01:20 -05:00
mark_story
a16f4c5248
Updating version numbers for 1.3.5
2010-10-24 13:56:45 -04:00
predominant
703344cbae
Updated version number to 1.3.4
2010-09-12 17:57:55 +10:00
mark_story
f01b4ae13b
Updating version numbers to 1.3.3
2010-07-18 23:00:24 -04:00
predominant
0eea0ce0f8
Updating version numbers to 1.3.2
2010-06-07 02:21:51 +10:00
mark_story
0180daaad3
Updating version numbers to 1.3.1
2010-05-29 13:26:34 -04:00
predominant
1ec220dac2
Removing closing PHP tags.
2010-05-11 08:07:49 +10:00
predominant
1c064788c5
Updated vesion numbers to 1.3.0
2010-04-25 14:27:29 +10:00
Mark Story
e2b5470d19
Updating version numbers to 1.3.0-RC4
2010-04-12 22:27:18 -04:00
Mark Story
3f343e7874
Updating version numbers to 1.3.0-RC3
2010-03-28 19:13:49 -04:00
Mark Story
edf2ea1e74
Updating version numbers to 1.3.0-RC2
2010-03-14 16:44:54 -04:00
Mark Story
ee3c2efec7
Updating version number to 1.3.0-RC1
2010-02-28 20:48:26 -05:00
Mark Story
6a3347ef7c
Merge remote branch 'origin/1.2' into 1.2-merger
...
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/libs/tasks/model.php
cake/dispatcher.php
cake/libs/l10n.php
cake/libs/model/datasources/dbo_source.php
cake/libs/view/pages/home.ctp
cake/tests/cases/console/libs/tasks/model.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/cases/libs/view/helpers/text.test.php
2010-02-20 01:32:04 -05:00
Mark Story
7daad4acaf
Merge branch '1.2' of github.com:cakephp/cakephp1x into 1.2
2010-02-02 20:39:25 -05:00
Mark Story
be7ddfb972
Updating version numbers to 1.2.6
2010-01-29 21:54:54 -05:00
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
527eec1a54
Fixing doc tags to make merge easier.
2010-01-26 16:51:53 -05:00
Mark Story
f10d7dde75
Updating version numbers. to 1.3.0-beta
2010-01-16 20:38:08 -05:00
Mark Story
f11068b831
Trimming trailing whitespace from files. Refs #201
2010-01-15 13:26:47 -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
4965ab5bdc
Updating version numbers for 1.3.0-alpha
2009-11-03 19:52:03 -05: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
predominant
115ae3f1df
Updating CakePHP version.
2009-09-09 19:12:00 +10:00
gwoo
5f87f74b09
setting version to 1.2.4.8284
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8284 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-08-03 20:53:50 +00:00
gwoo
c4878cf95d
Merging fixes to trunk
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8166 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-05-04 21:17:19 +00:00
gwoo
1f7eb18107
fixing up versions numbers in 1.3
2009-05-01 11:17:53 -07:00
gwoo
fc7773fe2d
merging fixes to trunk. set version to 1.2.2.8120
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8120 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-19 20:25:10 +00:00
nate
b6fed414e8
Updating version number in core config
2009-01-20 14:06:00 -05:00
gwoo
9f83e96fb9
merging fixes to trunk
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8004 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-01-16 20:15:21 +00:00
gwoo
18353519ed
tagging version 1.2.0.7962
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7962 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-25 23:30:33 +00:00
gwoo
fafc429a8f
merging changes to trunk and updating version number
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7961 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-25 23:21:36 +00:00
gwoo
0e458ff30b
merge fixes to trunk and updating version number
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7945 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-19 02:16:01 +00:00
AD7six
3f2fa6929b
changing tabs for spaces in comment block indentation
...
Removing address and replacing with cakefoundation url
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
nate
faa8e8af60
Updating 1.1 and 1.2 verison numbers
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7692 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-02 05:06:48 +00:00
gwoo
2967fd8d01
Merging 1.2.x.x changes and enhancements to trunk: [7295] [7294] [7293] [7292] [7291] [7290] [7289] [7288] [7287] [7286] [7285] [7283] [7281] [7280] [7278] [7276] [7275] [7274] [7273] [7272] [7271] [7269] [7268] [7267] [7266] [7265] [7264] [7263] [7262] [7261] [7260] [7259] [7258] [7257] [7256] [7254] [7253] [7252] [7251] [7250] [7249] [7248] [7247] [7246] [7245] [7244] [7243] [7242] [7241] [7240] [7239] [7238] [7237] [7236] [7235] [7234] [7233] [7232] [7231] [7230] [7229] [7228] [7227] [7226] [7225] [7222] [7221] [7220] [7219] [7217] [7216] [7215] [7214] [7213] [7212] [7211] [7210] [7209] [7208] [7207] [7206] [7205] [7204] [7203] [7202] [7201] [7200] [7198] [7197] [7196] [7195] [7194] [7193] [7192] [7191] [7190] [7189] [7188] [7187] [7186] [7185] [7184] [7183] [7182] [7181] [7180] [7179] [7178] [7177] [7175] [7174] [7173] [7172] [7171] [7170] [7169] [7167] [7165] [7164] [7163] [7162] [7158] [7155] [7154] [7153] [7152] [7149] [7148] [7146] [7145] [7144] [7143] [7141] [7140] [7139] [7138] [7137] [7136] [7134] [7133] [7128] [7126]
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-27 09:09:03 +00:00
gwoo
e3fea51329
merging fixes to trunk [7120] [7121] [7122] [7123] [7124]
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7125 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-05 15:06:49 +00:00
gwoo
a161d04cf1
version number sync.
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7119 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-04 21:01:51 +00:00
nate
42da5aba81
Moving Cake folder to correct location
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2
deleting cake folder from svn
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
phpnut
67c91aa009
Merging bug fixes and enhancements to the trunk:
...
[5876] [5878] [5879] [5880] [5881] [5882] [5883] [5884] [5885] [5886] [5887] [5888] [5889] [5890] [5891]
[5892] [5893] [5894] [5895] [5896] [5897] [5898] [5899] [5900] [5901] [5902] [5903] [5904] [5905] [5906]
[5907] [5908] [5909] [5910] [5911] [5912] [5913] [5914] [5915] [5916] [5917] [5918] [5919] [5920] [5921]
[5922] [5923] [5924] [5925] [5926] [5927] [5928] [5929] [5930] [5931] [5932] [5933] [5934] [5935] [5936]
[5937] [5938] [5939] [5940] [5941] [5942] [5943] [5944] [5945] [5946] [5947] [5948] [5949] [5950] [5951]
[5952] [5953] [5954] [5955] [5956] [5957] [5958] [5959] [5960] [5961] [5962] [5963] [5964] [5965] [5966]
[5967] [5968] [5969] [5970] [5971] [5972] [5973] [5974] [5975] [5976] [5977] [5978] [5979] [5980] [5981]
[5982] [5983] [5984] [5985] [5986] [5987] [5988] [5989] [5990] [5991] [5992] [5993] [5994] [5995] [5996]
[5997] [5998] [5999] [6000] [6001] [6002] [6003] [6004] [6005] [6006] [6007] [6008] [6009] [6010] [6011]
[6012] [6013] [6014] [6015] [6016] [6017] [6018] [6019] [6020] [6021] [6022] [6023] [6024] [6025] [6026]
[6027] [6028] [6030] [6031] [6032] [6033] [6034] [6035] [6036] [6037] [6038] [6039] [6041] [6042] [6043]
[6044] [6046] [6047] [6048] [6049] [6050] [6051] [6052] [6053] [6054] [6055] [6056] [6057] [6058] [6059]
[6060] [6061] [6062] [6063] [6064] [6065] [6066] [6067] [6068] [6069] [6070] [6071] [6072] [6073] [6074]
[6075] [6076] [6077] [6078] [6079] [6080] [6081] [6082] [6083] [6084] [6085] [6086] [6087] [6088] [6089]
[6090] [6091] [6092] [6093] [6094] [6095] [6096] [6097] [6098] [6099] [6100] [6101] [6102] [6103] [6104]
[6105] [6106] [6107] [6108] [6109] [6110] [6111] [6112] [6113] [6114] [6115] [6117] [6118] [6119] [6120]
[6121] [6122] [6123] [6124] [6125] [6126] [6127] [6128] [6129] [6130] [6131] [6132] [6133] [6134] [6135]
[6136] [6137] [6138] [6139] [6140] [6141] [6142] [6143] [6144] [6145] [6146] [6147] [6148] [6149] [6150]
[6151] [6152] [6153] [6154] [6155] [6156] [6157] [6158] [6159] [6160] [6161] [6162] [6163] [6164] [6165]
[6166] [6167] [6170] [6171] [6172] [6173] [6174] [6175] [6176] [6177] [6178] [6179] [6180] [6181] [6182]
[6183] [6184] [6185] [6186] [6187] [6188] [6189] [6190] [6191] [6192] [6193] [6194] [6195] [6196] [6197]
[6198] [6199] [6200] [6201] [6202] [6203] [6204] [6205] [6206] [6207] [6208] [6209] [6210] [6211] [6212]
[6213] [6214] [6215] [6216] [6217] [6220] [6221] [6222] [6223] [6224] [6227] [6230] [6231] [6233] [6234]
[6235] [6236] [6237] [6239] [6240] [6241] [6242] [6243] [6244] [6245] [6246] [6247] [6248] [6249] [6251]
[6252] [6253] [6255] [6256] [6257] [6258] [6259] [6262] [6263] [6264] [6265] [6266] [6268] [6269] [6270]
[6271] [6272] [6273] [6274] [6275] [6276] [6277] [6278] [6279] [6280] [6281] [6282] [6283] [6284] [6285]
[6286] [6287] [6288] [6289] [6290] [6291] [6292] [6293] [6294] [6295] [6296] [6297] [6298] [6299] [6300]
[6301] [6302] [6303] [6304] [6306] [6307] [6308] [6309] [6310]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6311 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-02 06:33:52 +00:00
phpnut
cb53dc61b0
"Closes #2897 , Built-in file validation.
...
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
phpnut
a83cfa8489
"Reverting [6007]"
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6009 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-16 20:34:05 +00:00
nate
97dd2ea2ea
Updating cache config check in Configure::__loadBootstrap()
...
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6007 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-16 20:07:38 +00:00
phpnut
c000940e36
Closes #2119 Only define clone() in PHP4 when it hasn't been already defined.
...
Closes #2213 , Support multiple plugin paths.
Closes #2234 , filepaths to behavior classes should be cached in class.paths.php also
Closes #2345 , ability to group components into subfolders
Closes #2645 , Improvement to basic.php for class loading.
Fixes #3526 , Cache::write, when using just the config name, it fails.
Fixes #3559 , loading plugin model as assoc don't work.
Closes #3567 Controller Folders (Note this does not need routing to work, but controller names can not conflict with others in the same application so naming must still be unique)
Fixes #3579 , email.php component: Parse error with php 4.
Adding new class and file importer.
Updated most of the core to use the importer.
Added ClassRegsitry::init() that will create and instance of an object and store it in the registry.
Deprecated most of the load functions in basics.php
Plugin model loading now forces using the dot notation, to use models within a plugin, all the model associations must be in the PluginName.Model syntax, if this is not used, the plugin will look for the models in the main app/models directory first, if not found then it will search the plugin directories recursively until it finds a model.
var $belongsTo = array('SomeModel'); will look for some_model.php in the app/models
var $belongsTo = array('MyPlugin.SomeModel'); will look for some_model.php in my_plugin/models
var $belongsTo = array('MyPlugin.MyPlugin', 'SomeModel'); will used my_plugin/models/my_plugin.php and app/models/some_model.php
The controllers of the plugin will still look for the default models inside the plugin if var $uses is not set:
var $uses = array('SomeModel'); will look for some_model.php in the app/models
var $uses = array('MyPlugin.SomeModel'); will look for some_model.php in my_plugin/models
var $uses = array('MyPlugin.MyPlugin', 'SomeModel'); will used my_plugin/models/my_plugin.php and app/models/some_model.php
All of the above will work between plugins and main app
These changes also allow placing model and controllers is sub directories
Removed old class.paths.php file generation
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6001 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-16 09:35:19 +00:00
phpnut
dc517ddc56
Merging changes and enhancements into the trunk:
...
Revision: [5874] Revision: [5873] Revision: [5872] Revision: [5871] Revision: [5870] Revision: [5869] Revision: [5868] Revision: [5867] Revision: [5866]
Revision: [5865] Revision: [5864] Revision: [5863] Revision: [5862] Revision: [5861] Revision: [5860] Revision: [5859] Revision: [5858] Revision: [5857]
Revision: [5856] Revision: [5855] Revision: [5854] Revision: [5853] Revision: [5852] Revision: [5851] Revision: [5849] Revision: [5848]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5875 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-23 00:25:51 +00:00
