Commit graph

215 commits

Author SHA1 Message Date
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
2011-08-14 21:12:05 -04:00
mark_story
d93c8cb200 Merge branch '1.3' into merger
Conflicts:
	cake/libs/controller/components/security.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
	lib/Cake/Test/Case/Utility/SetTest.php
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/CacheHelper.php
2011-08-14 14:39:49 -04:00
ADmad
5d79299362 For paging links the 'class' attribute is now always applied to the wrapping tag for consistency. Closes #1759 2011-08-14 05:09:57 +05:30
Jose Lorenzo Rodriguez
9b6ea7dc45 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-08-11 13:17:19 -04:30
Jose Lorenzo Rodriguez
3d461724cf Re-adding primaryKey detection support to FormHelper, it was removed mistakenly in last refactor 2011-08-11 12:13:01 -04:30
Mark Story
2ce2d06de2 Fixing issue where postLink() would fail when used with SecurityComponent. 2011-08-10 21:53:33 -04:00
Maggion Emmanuel
6cd89b0992 Edited lib/Cake/View/Helper/FormHelper.php via GitHub 2011-08-09 17:59:55 +03:00
Maggion Emmanuel
cb5f57f0ed Adding support for url input 2011-08-09 17:02:00 +03:00
mark_story
a268eea24f Expanding docs on HtmlHelper. 2011-08-07 18:17:14 -04:00
mark_story
5330096019 Fixing parameter name in RssHelper docs.
Fixes #1888
2011-08-07 09:14:16 -04:00
Mark Story
4da671c952 Merge pull request #157 from ProLoser/patch-2
Added `'integer' => 'number'` for HTML5
2011-08-01 18:07:40 -07:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
Juan Basso
d84531d29c Using @property to autocomplete components and helpers in some IDEs. Also added @property to bake of controller and model. Fixes #103. 2011-07-31 20:28:35 -04:00
Juan Basso
7604763888 Updated some file headers to include correct license and copyright. 2011-07-31 19:14:36 -04:00
Juan Basso
2a50a1ea99 Included @var in API that was missing. 2011-07-31 17:05:20 -04:00
Juan Basso
fedadc091c Included @throws in API that was missing. 2011-07-31 16:55:52 -04:00
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Juan Basso
e4a1816557 Changed the signature of methods to avoid strict messages. 2011-07-30 19:17:20 -04:00
Juan Basso
552791d74b Marked Helper::_parseAttributes() and Helper::_formatAttribute() as deprecated. 2011-07-28 23:33:33 -04:00
Juan Basso
02f290ac52 Fixed some API doc in views. 2011-07-28 22:45:47 -04:00
Dean Sofer
2ef17ec0a7 Additional tweak to FormHelper::input(), make float types use the number input 2011-07-27 15:15:31 -07:00
Jose Lorenzo Rodriguez
402934fa4d Updating version numbers to 2.0.0-beta 2011-07-26 13:20:27 -04:30
Dean Sofer
333f36585b Added 'integer' => 'number' for HTML5
Located in $map in the `FormHelper::input()` method. This means that if a field input is related to an integer column in the database, it will show up as a number input in the HTML5 form (where supported) yet gracefully degrade.
2011-07-26 01:39:56 -07:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Jose Lorenzo Rodriguez
2b7888ec47 Reverting change done by previous merge 2011-07-25 14:58:51 -04:30
Jose Lorenzo Rodriguez
febf28f34b Merge remote-tracking branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/templates/default/views/home.ctp
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/media.test.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/test_app/views/pages/home.ctp
	lib/Cake/Cache/Engine/ApcEngine.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/View/Helper/FormHelper.php
2011-07-25 14:44:23 -04:30
Juan Basso
a2e7c0febe Optimization in FormHelper::postLink(). 2011-07-18 20:33:45 -04:00
Jose Lorenzo Rodriguez
ad28228495 Removing unused parameters of tagIsInvalid() 2011-07-16 17:36:47 -04:30
Jose Lorenzo Rodriguez
d5ce09cd96 Restoring the validationErrors property in FormHelper, it will be checked first before the validation errors in the model 2011-07-15 18:24:27 -04:30
Jose Lorenzo Rodriguez
84aba009e7 Documentation and code cleaning, this commit means that the FormHelper is now fully able to locate models even though lazy loading is used in the controller, closes #1690 2011-07-14 20:35:44 -04:30
Jose Lorenzo Rodriguez
0c79ad88a3 Cleaning up the code and adding tests for new features 2011-07-14 17:26:55 -04:30
Jose Lorenzo Rodriguez
ba012ed950 Adding a special case for not trying to instantiate a Model called Model in FormHelper 2011-07-14 11:13:51 -04:30
Jose Lorenzo Rodriguez
ef5650c034 Fixing ClassRegistry that was incorrectly checking class inheritance
Fixing Model class that was incorrectly sending model names to be instantiated
Fixing more FormHelper tests
2011-07-14 01:30:52 -04:30
Jose Lorenzo Rodriguez
1941be6a76 Updating FormHelper tests 2011-07-14 01:03:29 -04:30
Jose Lorenzo Rodriguez
39dadf58db Refactoring how model information is extracted in the FormHelper, it is done now in a lazy manner and hopefully using less memory 2011-07-13 23:49:50 -04:30
Jose Lorenzo Rodriguez
22f02373c9 Moving tagIsInvalid from Helper back to FormHelper, as it is a better home for it 2011-07-13 23:49:01 -04:30
José Lorenzo Rodríguez
af12a17b81 Fixing copy paste typos from previous commit 2011-07-07 09:59:02 -07:00
Jose Lorenzo Rodriguez
feb567d4ee Adding better help and documentation for loading plugins. The exception renderer will serve a helpful page if a plugin is missing 2011-07-07 02:34:22 -04:30
mark_story
1d0d3f80fb Fixing Helper::value() when models exist in ClassRegistry
and field values are empty.
Fixes #1817
2011-07-06 21:26:07 -04:00
mark_story
be09c67fa6 Fixing failing test that happened between 12:00 & 12:59 2011-07-02 13:01:08 -04:00
mark_story
c2a96267b2 Merge branch 'form-helper' into 2.0 2011-07-02 12:13:41 -04:00
Mark Story
2f24be77e9 Merge pull request #140 from majna/2.0
Fix for render element - allow under_scored plugin name.
Fixes #1814
2011-07-01 18:11:57 -07:00
Majna
71ed244f14 Fix for render element - allow under_scored plugin name. Fixes #1814 2011-07-02 02:17:44 +02:00
mark_story
bef2e75bdf Fixing failing debugger test.
Adding doc blocks for helper properties.
2011-07-01 07:56:48 -04:00
mark_story
c9acb6b587 Moving FormHelper specifics into that class. 2011-07-01 07:39:03 -04:00
Mark Story
89258327c6 Moving entity() and its related attributes to Helper
Removing entity() and its attributes from View.
Having that information on View allowed for unwanted side effects,
and seemed like a break of encapsulation.
2011-06-25 20:02:34 -04:00
Mark Story
1ffa7366a5 Removing now dead code. 2011-06-25 19:31:20 -04:00
Mark Story
4073584eef Fixing more failing tests.
Fixing use of properties that are going away.
2011-06-25 19:31:20 -04:00
Mark Story
f5b3549018 Fixing issue where _method would be remembered as a field. 2011-06-25 19:31:20 -04:00
Mark Story
25870441bc Fixing '2.name' style fields when creating multiple record forms. 2011-06-25 19:31:20 -04:00
Mark Story
b7e554fcd7 Starting to update FormHelper's internals to work with changes in
Helper.
2011-06-25 19:31:19 -04:00
Mark Story
3a847ae28f Updating more tests for change in Helper setEntity(). 2011-06-25 19:31:19 -04:00
Mark Story
8a8336c1b0 Starting to convert Helper::setEntity() and View::entity()
to not be nearly as complex and magic.  This also
helps reduce coupling between the helpers and Models.
2011-06-25 19:31:19 -04:00
Robert Sworder
fb3a1928d3 Minor comment and path changes. 2011-06-25 15:08:41 +01:00
Mark Story
d6e262da2d Fixing form action attributes being double encoded with
querystring attributes.
Fixes #1748
2011-06-23 14:32:53 -07:00
Mark Story
3e4388d7d7 Fixing failures from merging. 2011-06-23 13:22:08 -07:00
Mark Story
91a1cf81f3 Merge branch '1.3' into merger
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
2011-06-23 12:48:06 -07:00
Mark Story
edda41e23b Removing 'altclass' from scaffold templates.
Refs #306
2011-06-22 13:08:17 -07:00
Graham Weldon
3474837492 Fix error message for database configuration missing. 2011-06-21 11:42:35 -07:00
Juan Basso
1c7d54eacc Updated the paths from comments. 2011-06-19 20:28:40 -04:00
Mark Story
b4a780332f Add the 'model' key to PaginatorHelper::counter()
Its available as both '%model%' and '{:model}'
Fixes #1773
2011-06-19 14:05:28 -07:00
Renan Gonçalves
f4e598f920 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-06-15 21:01:17 +02:00
Renan Gonçalves
98f2684c66 Assigning the viewVars to $this too. It was empty before, the result was no variables. 2011-06-15 21:01:08 +02:00
mark_story
613410f985 Making submit() and button() create unlocked fields by default.
This fixes issues where buttons would cause post validation checks to
fail.
Fixes #1746
2011-06-14 22:37:02 -04:00
mark_story
f3f475f502 Updating method name, variables, and properties to be unlocked.
This better reflects what is actually going to happen, as fields that are
unlocked are not checked.  It also works better with the idea that secure = false
means unlocked or unsecured.
2011-06-14 21:50:45 -04:00
mark_story
0c3c6e5e21 Adding a new hidden field for the disabled fields.
Updating the FormHelper tests for the new field.
2011-06-14 21:50:45 -04:00
mark_story
83184c99da Adding disableField() to start allowing disabled fields to be manipulated
from the view/helper.
2011-06-14 21:50:45 -04:00
mark_story
2a15e630ef Starting to refactor field securing, so disabledFields can be controlled
from the Helper.
2011-06-14 21:50:44 -04:00
Leonid Mamchenkov
01b2e7eea0 Removed unnecessary Inflector::camelize() calls 2011-06-15 00:36:14 +03:00
Leonid Mamchenkov
ffab73442a Camelize file names in Errors 2011-06-15 00:27:44 +03:00
Leonid Mamchenkov
aeb510e521 Camelized controller file names in Errors 2011-06-15 00:14:38 +03:00
Leonid Mamchenkov
4c02fa75eb Updated paths in all Errrors 2011-06-14 21:57:42 +03:00
Renan Gonçalves
2e3f828098 Updating the home.ctp file to include last changes made on directories name and i18n usage. 2011-06-12 23:24:42 +02:00
mark_story
71e2c8e734 Changing how 'id' attribute is treated for multiple checkboxes.
Setting the id option, will now also override the generated id's for
checkboxes.
Fixes #1691
2011-06-06 22:32:55 -04:00
ADmad
cb946bbcf3 Added warning message on homepage for misconfigured URL rewriting. Removed dead link for cakeforge.org 2011-06-05 03:34:28 +05:30
Neil Crookes
ea82261ad8 Removing call to RssHelper::header() as method does not exit 2011-05-31 22:50:47 +01:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Renan Gonçalves
ed96936ea7 According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything. 2011-05-30 22:26:42 +02:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
ADmad
4c042ae133 Adding proper visibility keywords for class functions 2011-05-29 03:31:34 +05:30
Ceeram
5f97292648 Change case of Controller::$plugin, fixing missing plugin exceptions, tests updated. Also removing no longer needed camelize() calls 2011-05-26 15:31:40 +02:00
Juan Basso
acc0660989 Changed the emails folder in layouts to CamelCased. Fixes #1730. 2011-05-24 01:05:29 -04:00
Jose Lorenzo Rodriguez
bfcfa4c06e Marking 2.0.0-alpha 2011-05-20 22:18:14 -04:30
AD7six
20f541108e partial fix for the scaffold test 2011-05-16 23:50:42 +02:00
Thomas Ploch
785c80ba88 Added missing string concatenator to lib/Cake/Views/pages/home.ctp. 2011-05-16 08:41:25 +02:00
AD7six
805cc944da correct for case sensitivity 2011-05-15 19:41:34 +02:00
AD7six
ef684c3d94 a couple of find/replace oversights 2011-05-15 18:40:48 +02:00
AD7six
0cb70ae3bb remove CONFIGS constant 2011-05-15 18:34:52 +02:00
AD7six
afa8f6b441 remove LIBS constant
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02:00
Jose Lorenzo Rodriguez
91bce16e9d Merge remote-tracking branch 'origin/2.0' into 2.0-merge
Conflicts:
	lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
	lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
	lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
	lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
	lib/Cake/tests/Case/Log/Engine/FileLog.php
	lib/Cake/tests/Case/Log/Engine/FileLogTest.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
	lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
2011-05-15 00:40:54 -04:30
Jose Lorenzo Rodriguez
6713bb154e Making themes also CamelCased 2011-05-15 00:09:32 -04:30
Jose Lorenzo Rodriguez
eea981940e Replacing config string in favor of Config 2011-05-13 03:36:45 -04:30
Jose Lorenzo Rodriguez
649b863fc5 Changing more strings after renaming folders 2011-05-13 03:19:00 -04:30
Jose Lorenzo Rodriguez
7ba60ff424 Changing more paths 2011-05-13 03:15:04 -04:30
Jose Lorenzo Rodriguez
8746a485bd Search and replace for changed paths 2011-05-13 02:53:35 -04:30
Jose Lorenzo Rodriguez
3b725290ba Renaming elements and layouts 2011-05-13 02:45:36 -04:30
Jose Lorenzo Rodriguez
ded3cb4826 Renaming more folders 2011-05-13 02:31:33 -04:30
mark_story
523b1b6165 Updating docs. 2011-05-12 22:41:35 -04:00
Jose Lorenzo Rodriguez
54eb934892 Fixing plugin related tests in Core package 2011-05-10 00:46:24 -04:30
Jose Lorenzo Rodriguez
bd1479f732 Fixing a bunch of tests in the View/Helper package 2011-05-09 23:33:58 -04:30