mark_story
|
3237402fb8
|
Merge branch '1.3' into merger
Conflicts:
cake/libs/configure.php
|
2010-11-20 23:14:33 -05:00 |
|
mark_story
|
e0a8ffe8a3
|
Applying patch from 'jmccaffrey' to fix issues on windows where virtual
machine paths would not be correctly handled. Fixes #1254
|
2010-11-20 13:26:30 -05:00 |
|
mark_story
|
f847080cbf
|
Changing more php version strings.
|
2010-10-03 12:46:03 -04:00 |
|
mark_story
|
705e90bef7
|
Merge branch '1.3' into 2.0-merge
Conflicts:
cake/libs/cache/memcache.php
cake/libs/cake_session.php
cake/libs/model/behaviors/acl.php
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/cake_test_fixture.test.php
cake/tests/cases/libs/model/behaviors/acl.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
|
2010-08-15 23:09:02 -04:00 |
|
mark_story
|
ccfb1d179a
|
Expanding test and fixing issue where the return of Folder::create() would be incorrect even though the directory was properly created. Fixes #996
|
2010-08-09 22:56:41 -04:00 |
|
mark_story
|
02a04abf6b
|
Fixing return values of methods, and updating tests to run properly in Phpunit which uses exceptions instead of errors.
|
2010-05-30 22:57:28 -04:00 |
|
predominant
|
8f880731c6
|
Removing closing PHP tags.
|
2010-05-11 08:27:28 +10:00 |
|
predominant
|
1ec220dac2
|
Removing closing PHP tags.
|
2010-05-11 08:07:49 +10:00 |
|
Mark Story
|
b7e4e46251
|
Removing lonely comment.
|
2010-04-18 01:17:01 -04:00 |
|
Mark Story
|
146ec004eb
|
Removing inheritance from Object. Constructor workarounds are no longer needed and Object methods are not used on these classes.
|
2010-04-18 01:12:00 -04:00 |
|
predominant
|
6bd9f0f05b
|
Convert models, datasources and file/folders to new version of translation shortcut function.
|
2010-04-16 02:00:25 +10:00 |
|
predominant
|
1497ec3910
|
Changed all public methods to specify public access.
|
2010-04-05 13:19:38 +10:00 |
|
predominant
|
850ca02bb6
|
Changed all public 'var' declarations to be 'public $var'
|
2010-04-04 17:14:00 +10:00 |
|
predominant
|
29dc12dbc2
|
Changed all $__ declared variables to private.
|
2010-04-04 16:33:39 +10:00 |
|
Mark Story
|
e0abe99d7d
|
Merge remote branch 'origin/1.2' into 1.2-merger
Conflicts:
cake/libs/view/helpers/html.php
cake/tests/cases/libs/folder.test.php
|
2010-02-28 01:58:29 -05:00 |
|
Mark Story
|
763aa524b9
|
Fixing recursive directory creation when nested create() calls fail. Fixes #347
|
2010-02-20 11:25:46 -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
|
59319b098b
|
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts:
cake/libs/folder.php
|
2010-01-25 11:20:05 -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
|
b33fdba6d9
|
Updating doc blocks on Folder class and implementing a few small refactors to make code simpler.
|
2010-01-25 11:18:33 -05:00 |
|
José Lorenzo Rodríguez
|
c2d19c2011
|
Various Optimizations, thanks jrbasso. Closes #232
|
2010-01-23 22:33:53 -04:30 |
|
Mark Story
|
f4e837d985
|
Removing all methods currently issuing warnings about being deprecated.
|
2010-01-21 15:14:23 -05:00 |
|
Juan Basso
|
473e07a674
|
Putting __() in strings that missing internationalization.
Signed-off-by: Mark Story <mark@mark-story.com>
|
2010-01-18 01:06:25 -05:00 |
|
Joël Perras
|
15b8a3ec71
|
Updating copyright date on all files.
|
2010-01-13 23:47: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 |
|
mark_story
|
a96c157d94
|
Applying optimizations to use of count() from 'jrbasso'
|
2009-11-21 15:14:21 -05: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
|
8f75ff58c7
|
Removing @filesource
|
2009-11-06 15:24:02 +11: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
|
ad305a890a
|
Applying optimization from 'ermayer' Reduces functions called from Folder::addPathElement() Fixes #178
|
2009-10-27 21:06:58 -04:00 |
|
mark_story
|
b5605b6408
|
Updating file headers
|
2009-08-31 22:48:22 -04:00 |
|
mark_story
|
fe3514371f
|
Updating folder + test case to reflect api changes.
|
2009-08-31 22:47:37 -04:00 |
|
mark_story
|
046d7c75d0
|
Adding warnings to newly deprecated methods.
|
2009-08-31 22:31:36 -04:00 |
|
mark_story
|
934bda0a74
|
Deprecating aliases in folder class.
|
2009-08-27 00:29:17 -04:00 |
|
gwoo
|
27437a808d
|
rmoving path check from Folder::tree fixes issues with classes not beign found in App::import
|
2009-08-05 11:26:19 -04:00 |
|
gwoo
|
2ae5d45180
|
fixing return of Folder::read when path is null
|
2009-08-02 17:22:57 -07:00 |
|
gwoo
|
ffe801bb28
|
fixing folder class when path give does not exist
|
2009-08-02 15:42:27 -07:00 |
|
gwoo
|
bf2b8a60e6
|
Merge branch '1.3-misc' into 1.3
|
2009-08-02 12:20:07 -07:00 |
|
AD7six
|
b2142df2bc
|
adding a newline before all comment blocks
|
2009-07-24 21:18:37 +02:00 |
|
jperras
|
e40428801e
|
Removing all uses of uses() global method & replacing with require or App::import.
|
2009-07-24 13:41:08 -04:00 |
|
gwoo
|
643651fe56
|
Merge master in 1.3
|
2009-03-19 14:10:13 -07:00 |
|
phpnut
|
3748987599
|
Adding fix from davidpersson: sort not working for subdirectories in Folder::findRecursive
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8102 3807eeeb-6ff5-0310-8944-8be069107fe0
|
2009-03-15 00:21:28 +00:00 |
|
mark_story
|
55cc02bc08
|
Fixing other uses of glob() to check for false values. Fixes #6044
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8034 3807eeeb-6ff5-0310-8944-8be069107fe0
|
2009-02-16 00:45:50 +00:00 |
|
phpnut
|
d5b86bc4bf
|
Closes #5733, Avoid delegation overhead in Folder::correctSlashFor();
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7939 3807eeeb-6ff5-0310-8944-8be069107fe0
|
2008-12-18 00:27:10 +00:00 |
|
phpnut
|
7f30d75739
|
Closes #5735, Replace preg_match in Folder::isSlashTerm
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7938 3807eeeb-6ff5-0310-8944-8be069107fe0
|
2008-12-18 00:22:57 +00:00 |
|