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
|
e33a9a7846
|
Adding new limit/offset pagination for SQLServer 11.
|
2011-06-22 17:01:36 -07:00 |
|
Mark Story
|
1a155c80c0
|
Fixing support for nchar and nvarchar fields in SQL server.
These fields report their length as double of what its defined.
|
2011-06-22 11:39:06 -07:00 |
|
Mark Story
|
3bc6195967
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-06-22 10:56:18 -07:00 |
|
Mark Story
|
a825d8280f
|
Adding support for SQLServer's datetime2 column,
as that is the preferred datetime format in SQLServer.
|
2011-06-22 10:24:45 -07:00 |
|
Mark Story
|
d45b7fa174
|
Fixing identity check.
|
2011-06-22 10:15:15 -07:00 |
|
Graham Weldon
|
876a047a76
|
Change type check to loose type checking for Sqlserver limit -1
|
2011-06-22 09:54:35 -07:00 |
|
Mark Story
|
0c1472ee44
|
Adding better support for nvarchar(MAX) in SQLServer
Newer versions of SQLServer perfer to use nvarchar(max) for
text columns.
|
2011-06-22 09:05:06 -07:00 |
|
Mark Story
|
936d068eec
|
Reformating SQLServer 'describe' query.
|
2011-06-22 09:05:06 -07:00 |
|
Jose Lorenzo Rodriguez
|
d0ef655601
|
Using the field name for aliasing for Sqlsrv as in Postgres, removing dead code
|
2011-06-21 18:58:33 -04:30 |
|
Jose Lorenzo Rodriguez
|
97e51f1d94
|
Removing Sqlserver::value() as it is already abstracted in DboSource
|
2011-06-21 18:07:05 -04:30 |
|
Jose Lorenzo Rodriguez
|
f79fc74aad
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-06-21 17:09:53 -04:30 |
|
Jose Lorenzo Rodriguez
|
9aa2a4227f
|
Fixing offsetting in paginated queries in SqlSrv
|
2011-06-21 17:09:12 -04:30 |
|
Mark Story
|
f353eb733f
|
Fixing incorrect default value.
|
2011-06-21 14:20:20 -07:00 |
|
Mark Story
|
4deedf6da2
|
Removing extra paging result that ends up because of SQLserver 10 workarounds.
|
2011-06-21 13:17:49 -07:00 |
|
Jose Lorenzo Rodriguez
|
3d2a732cd3
|
Reverting testing changes pushed in past commit
|
2011-06-21 15:30:17 -04:30 |
|
Jose Lorenzo Rodriguez
|
a34358faa4
|
Fixing FormAuthenticateTest for Sqlsrv
|
2011-06-21 14:29:18 -04:30 |
|
Graham Weldon
|
f1108b2ef1
|
Fixed pagination for SqlServer
|
2011-06-21 11:38:09 -07:00 |
|
Jose Lorenzo Rodriguez
|
f4aeb514e3
|
Fiing CakeSchema so it runs without errors on Sqlsrv
|
2011-06-21 11:13:33 -04:30 |
|
Jose Lorenzo Rodriguez
|
cdc81333e8
|
Adding support in SqlSrv for drop table if exists
|
2011-06-20 19:49:06 -04:30 |
|
Jose Lorenzo Rodriguez
|
cf49d51e75
|
Fixing the binary type for SqlSrv
|
2011-06-20 19:14:21 -04:30 |
|
Jose Lorenzo Rodriguez
|
9f85e24413
|
Adding float precision support to CakeSchema when using Sqlsrv
|
2011-06-20 18:43:26 -04:30 |
|
Juan Basso
|
1c7d54eacc
|
Updated the paths from comments.
|
2011-06-19 20:28:40 -04:00 |
|
Jose Lorenzo Rodriguez
|
2a39e6869c
|
Merge branch '2.0' into 2.0-merge
Conflicts:
lib/Cake/Test/Case/Controller/ScaffoldTest.php
lib/Cake/Test/Case/Model/ConnectionManagerTest.php
lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
|
2011-06-17 18:04:03 -04:30 |
|
Florian Krmer
|
98e29b7246
|
Fixing the DatabaseSession to work with models that use a different primary key field than id.
|
2011-06-15 22:56:55 +02:00 |
|
Leonid Mamchenkov
|
8271970639
|
Fix for PHP notice (Fixes #1424)
|
2011-06-02 01:12:25 +03: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 |
|
ADmad
|
4c042ae133
|
Adding proper visibility keywords for class functions
|
2011-05-29 03:31:34 +05:30 |
|
Maggion Emmanuel
|
8a701f3ac9
|
Fixed this following error: failed to open stream: No such file or directory [CORE\Cake\Model\Behavior\AclBehavior.php, line 52]
|
2011-05-28 06:45:06 -07:00 |
|
ADmad
|
40c397b003
|
Merge pull request #98 from majna/2.0
Fix for wrong callback in $callbacks array: renamed afterError to onError
|
2011-05-27 15:02:48 -07:00 |
|
Majna
|
17384f3cf4
|
Fix for wrong callback in $callbacks array: renamed afterError to onError
|
2011-05-27 23:23:11 +02:00 |
|
Jose Lorenzo Rodriguez
|
e669a81e0a
|
Reverting change in ConnectionManager, sourceList() will only return the instantiated datasources
Fixing remaining tests failing due to contamination of loaded plugin is app
|
2011-05-27 02:28:38 -04:30 |
|
Jose Lorenzo Rodriguez
|
b320e4323f
|
Improving ConnectionManager tests
|
2011-05-27 02:13:35 -04:30 |
|
Jose Lorenzo Rodriguez
|
01f6744e35
|
Removing unneeded line in ConnectionManager
|
2011-05-27 01:31:50 -04: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
|
a744a74f1e
|
Not changing to NULL strings.
|
2011-05-23 23:10:44 -04:00 |
|
Juan Basso
|
7bae41c461
|
Fixed the error check in queries and storing the right value to last affected in non-select queries.
|
2011-05-23 00:22:08 -04:00 |
|
Juan Basso
|
39320ef352
|
Renamed the Mssql driver to Sqlserver.
|
2011-05-22 23:19:13 -04:00 |
|
Juan Basso
|
e049e35b5d
|
Catching the error in execute for SQL Server to have the same behavior from the others drivers.
|
2011-05-22 22:16:22 -04:00 |
|
Juan Basso
|
f0db55de6f
|
Using dbo methods to manage the transaction.
|
2011-05-22 01:07:58 -04:00 |
|
Juan Basso
|
ad67f3e1bc
|
SQL Server PDO support prepare only to SELECT statements, others commands need to use exec method.
|
2011-05-22 00:49:49 -04:00 |
|
Juan Basso
|
968fa1d5ef
|
Included an option to configure the prepate statement. SQL Server requires the cursor option to return the affected rows.
|
2011-05-21 22:40:30 -04:00 |
|
Juan Basso
|
11d249e43b
|
Updating PHPDoc and method visibility.
|
2011-05-21 22:18:57 -04:00 |
|
Juan Basso
|
375f86d2a6
|
Changed the default empty value when create columns.
|
2011-05-21 21:50:25 -04:00 |
|
Renan Gonçalves
|
c602fc845b
|
Reverting the change to insertMulti, worked to solve the cache issue when trying to get the model schema.
|
2011-05-18 20:59:17 +02:00 |
|
Renan Gonçalves
|
37b9bd59bc
|
Trying to fix the Mssql as much as possible.
Adding parameter to the insertMulti() method because Mssql tries to get the table schema and it fails most of the time.
|
2011-05-18 20:12:36 +02:00 |
|
Renan Gonçalves
|
d1a984cde9
|
Resolving merge conflict.
|
2011-05-18 19:58:12 +02:00 |
|
AD7six
|
fe2ec74b0e
|
correct paths to Config dir
|
2011-05-16 21:52:25 +02:00 |
|
AD7six
|
0cb70ae3bb
|
remove CONFIGS constant
|
2011-05-15 18:34:52 +02:00 |
|