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
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
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
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
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
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
mark_story
523b1b6165
Updating docs.
2011-05-12 22:41:35 -04:00
Jose Lorenzo Rodriguez
d83555cc52
Merge remote-tracking branch 'origin/1.3' into merger
...
Conflicts:
cake/console/cake.php
cake/dispatcher.php
cake/libs/controller/components/auth.php
cake/libs/controller/controller.php
cake/libs/view/helpers/xml.php
cake/libs/view/pages/home.ctp
cake/libs/xml.php
cake/tests/cases/console/cake.test.php
cake/tests/cases/libs/controller/components/cookie.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
cake/tests/cases/libs/model/datasources/dbo_source.test.php
cake/tests/cases/libs/view/helpers/xml.test.php
cake/tests/cases/libs/xml.test.php
lib/Cake/Console/Command/SchemaShell.php
lib/Cake/Controller/Component/CookieComponent.php
lib/Cake/Network/Http/HttpSocket.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
lib/Cake/View/Helper/TextHelper.php
lib/Cake/View/Helper/TimeHelper.php
lib/Cake/config/config.php
lib/Cake/tests/Case/Cache/CacheTest.php
lib/Cake/tests/Case/Model/CakeSchemaTest.php
lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php
2011-05-04 01:10:23 -04:30
Jose Lorenzo Rodriguez
07b84a71ab
Removing unneeded assignments by reference
2011-04-29 11:49:46 -04:30
Thomas Ploch
bea666bb12
Removed JsBaseEngineHelper::$useNative. Removed json_encode() emulation from JsBaseEngineHelper::object(). Removed unnessecary call to get_object_vars() in JsBaseEngineHelper::object(). Removed unnessecary tests for equalness of emulation and native json_encode(). Added test for correct encoding of objects to JsHelper test case. Fixes #704
2011-04-26 22:35:33 -04:00
evilbloodydemon
1d7d20768f
Fixed typo in variable name
2011-04-26 21:44:37 +04:00
mark_story
d124b6c05d
Removing class from being excluded from the attributes applied to hidden inputs. Fixes #1124
2011-04-20 21:37:47 -04:00
ADmad
3844966714
Changed default value for key 'last' in validator options to true. Also implemented ability to list messages for all failed validations for a field at once, instead of current display of just one message at a time.
2011-04-18 02:08:48 +05:30
Jose Lorenzo Rodriguez
000e05b468
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
cake/tests/lib/templates/missing_conenction.php
cake/tests/lib/templates/missing_connection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/templates/missing_conenction.php
lib/Cake/View/Helper/FormHelper.php
lib/Cake/tests/Case/Core/ConfigureTest.php
2011-04-11 22:48:08 -04:30
Jose Lorenzo Rodriguez
433e9e7177
Fixing typos in time helper translations
2011-03-21 00:57:37 -04:30
AD7six
32df3156a7
consolidate cake_error and cake_developer to simply "cake_dev"
...
it's a lot easier for adding new translations to think:
is it for the end user?
use 'cake' as the domain
is it for the developer
use 'cake_dev' as the domain
is it for the console
use 'cake_console' as the domain
also neatly avoids the "this message is an error, and it's in
cake_developer, why?" - question (because cake_error was intended for
anything which is used in trigger_error/exceptions, not a variable named
$error
2011-03-20 16:38:31 +01:00
AD7six
d2badbeb22
update language domains
...
no domain - the thing being translated comes from the app - so let the
user handle that
cake - end user
cake_error - error messages
2011-03-19 18:29:31 +01:00
AD7six
e492bce64f
Merge branch '2.0-translations' of github.com:AD7six/cakephp into 2.0-class-loading
2011-03-16 17:08:15 +01:00
AD7six
64e71de52a
Merge branch '2.0-class-loading' of github.com:cakephp/cakephp into 2.0-class-loading
2011-03-16 17:07:22 +01:00
AD7six
39c7d03319
Merge branch '2.0-class-loading' into 2.0-translations
...
Conflicts:
lib/Cake/Console/Command/Task/ControllerTask.php
lib/Cake/Console/Command/Task/ProjectTask.php
lib/Cake/Core/Configure.php
lib/Cake/View/pages/home.ctp
2011-03-16 12:29:39 +01:00
Jose Lorenzo Rodriguez
2e2f5ea2a5
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-15 21:13:45 -04:00
AD7six
28eae99ecb
translation changes in the view folder
2011-03-12 20:02:56 +01:00
Jose Lorenzo Rodriguez
f8a08432f4
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-05 17:37:31 -04:30
Jose Lorenzo Rodriguez
42b3f993b9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-03-01 23:04:52 -04:30
José Lorenzo Rodríguez
4cebe55a9b
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
app/webroot/index.php
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Network/CakeRequest.php
lib/Cake/tests/cases/libs/controller/components/auth.test.php
2011-02-21 22:28:30 -04:30
José Lorenzo Rodríguez
227ed6ef27
Fixing the Js engine helpers
2011-02-14 00:19:06 -04:30
José Lorenzo Rodríguez
396fbeec91
Fixing the HtmlHelper tests
2011-02-14 00:18:10 -04:30
José Lorenzo Rodríguez
6e4f4efb79
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
lib/Cake/Console/Command/TestSuiteShell.php
lib/Cake/Console/TaskCollection.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Controller/Controller.php
lib/Cake/Core/App.php
lib/Cake/Model/BehaviorCollection.php
lib/Cake/Network/CakeRequest.php
lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
lib/Cake/TestSuite/CakeWebTestCase.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/TestSuite/TestRunner.php
lib/Cake/View/HelperCollection.php
lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
lib/Cake/tests/cases/libs/test_manager.test.php
2011-02-13 23:10:19 -04:30
José Lorenzo Rodríguez
aa18cca1c3
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/View/Helper.php
2011-01-28 01:14:59 -04:30
José Lorenzo Rodríguez
d9c99b5ef6
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/tests/cases/libs/controller_test_case.test.php
lib/Cake/Controller/ComponentCollection.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/TestSuite/Fixture/CakeTestFixture.php
lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
1332561164
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/helpers/js.php
lib/Cake/Console/Command/Task/FixtureTask.php
2011-01-09 23:32:05 -04:30
José Lorenzo Rodríguez
599a110d6b
Merge remote branch 'origin/2.0' into 2.0-class-loading
2011-01-08 22:59:02 -04:30
José Lorenzo Rodríguez
e8a93aef93
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Temporarly commenting code on App class while the transition is made
Conflicts:
lib/Cake/Core/App.php
2011-01-05 22:21:27 -04:30
José Lorenzo Rodríguez
4c0e06c451
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/bootstrap.php
cake/libs/view/helpers/js.php
lib/Cake/Model/AclNode.php
lib/Cake/Model/ConnectionManager.php
lib/Cake/bootstrap.php
lib/Cake/tests/cases/libs/controller/controller.test.php
2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
9fac0b92c6
Extracting JsBaseEngineHelper to its own file, fixing some JsHelper related test cases
2010-12-21 22:01:38 -04:30
José Lorenzo Rodríguez
07e43bb0f8
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
cake/libs/view/scaffolds/edit.ctp
cake/libs/view/scaffolds/form.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
cake/tests/test_app/views/posts/scaffold.edit.ctp
cake/tests/test_app/views/posts/scaffold.form.ctp
lib/Cake/Error/ErrorHandler.php
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/Datasource/CakeSession.php
lib/Cake/Routing/Router.php
lib/Cake/TestSuite/TestManager.php
lib/Cake/View/scaffolds/edit.ctp
lib/Cake/tests/cases/console/shells/bake.test.php
lib/Cake/tests/cases/libs/cake_log.test.php
lib/Cake/tests/cases/libs/cake_request.test.php
lib/Cake/tests/cases/libs/view/helpers/number.test.php
lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
8e5bd76752
Fixing several errors when running the testsuite
2010-12-11 01:17:55 -04:30
José Lorenzo Rodríguez
0732552739
Movig CakeSession to a better suited package
2010-12-07 00:02:42 -04:30
José Lorenzo Rodríguez
3f64844de9
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/Model/ConnectionManager.php
lib/Cake/basics.php
2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
377cbc546b
Fixing some errors in loading view classes
2010-12-04 22:06:53 -04:30
José Lorenzo Rodríguez
6b40c9c854
Moving I18n related classes to the new folder schema
2010-12-04 13:45:07 -04:30
José Lorenzo Rodríguez
f3eb2159eb
Making helpers load
2010-12-04 13:40:24 -04:30
José Lorenzo Rodríguez
be9bcb3627
Moving view clasess to their new home
2010-12-04 13:31:04 -04:30
