Mark Story
|
5035bb99f8
|
Renaming FileLog test case.
|
2011-06-23 13:24:26 -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 |
|
Maury M. Marques
|
de893b14ab
|
Unnecessary line
|
2011-06-23 09:54:29 -07:00 |
|
Mark Story
|
e33a9a7846
|
Adding new limit/offset pagination for SQLServer 11.
|
2011-06-22 17:01:36 -07:00 |
|
Mark Story
|
0e09f75a66
|
Updating table styles.
|
2011-06-22 13:53:38 -07:00 |
|
Mark Story
|
7392902abd
|
Syncing skel CSS with app/webroot css.
|
2011-06-22 13:17:38 -07:00 |
|
Mark Story
|
f547032f6f
|
Removing altrow from the bake default templates.
Refs #306
|
2011-06-22 13:14:31 -07:00 |
|
Mark Story
|
edda41e23b
|
Removing 'altclass' from scaffold templates.
Refs #306
|
2011-06-22 13:08:17 -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
|
1df0801c33
|
Updating SQLServer test to pass when the app has a model.
|
2011-06-22 11:08:14 -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
|
853c0bdd48
|
Removing var_dump() because I'm dumb.
|
2011-06-22 09:07:48 -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 |
|
José Lorenzo Rodríguez
|
92bbf1131b
|
Merge pull request #127 from mamchenkov/2.0
Fix for custom authentication objects (ticket #1757)
|
2011-06-22 08:30:47 -07:00 |
|
AD7six
|
26aeb11550
|
remove needless line of code
as pointed out by maurymmarques, in pull request 126
|
2011-06-22 15:39:33 +02:00 |
|
Leonid Mamchenkov
|
a1f47a803a
|
Added paths for Controller/Component/Auth (ticket #1757)
|
2011-06-22 16:28:39 +03:00 |
|
Mark Story
|
694819cb81
|
Fixing issue with generic.css and overlapping in view scaffolds.
Thanks to 'euromark' for the patch.
Fixes #1787
|
2011-06-21 22:28:25 -07:00 |
|
Mark Story
|
f641da89fa
|
Fixing issue with generic.css and overlapping in view scaffolds.
Thanks to 'euromark' for the patch.
Fixes #1787
Conflicts:
app/webroot/css/cake.generic.css
|
2011-06-21 22:28:03 -07:00 |
|
Mark Story
|
a6ccee3a7c
|
Merge pull request #124 from tPl0ch/1.3
Added App::import('Model', 'ConnectionManager') to cake/libs/sanitize.php
|
2011-06-21 16:35:15 -07:00 |
|
José Lorenzo Rodríguez
|
ea2f621d18
|
Merge pull request #125 from majna/2.0
Fix for wrong MissingPluginException message
|
2011-06-21 16:31:30 -07:00 |
|
Jose Lorenzo Rodriguez
|
ff34137d38
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-06-21 18:59:18 -04:30 |
|
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 |
|
Mark Story
|
9e4c367688
|
Adding Wincache support. Wincache is a fast shared memory
cache that performs very well on windows platforms.
|
2011-06-21 16:02:25 -07:00 |
|
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
|
734495d0c7
|
Removing bogus code that doesn't work when tests fail.
|
2011-06-21 14:20:20 -07:00 |
|
Mark Story
|
f353eb733f
|
Fixing incorrect default value.
|
2011-06-21 14:20:20 -07:00 |
|
Jose Lorenzo Rodriguez
|
2e5bdd862b
|
Adding a new change to the AuthComponent test to make it pass with Sqlsrv
|
2011-06-21 16:32:12 -04:30 |
|
Majna
|
e6b44755f9
|
Fix for wrong MissingPluginException message
|
2011-06-21 22:47:41 +02: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
|
e14c4412fd
|
Fixing more AuthComponent tests for Sqlsrv
|
2011-06-21 15:08:27 -04:30 |
|
Jose Lorenzo Rodriguez
|
9f1242492d
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-06-21 14:33:05 -04:30 |
|
Jose Lorenzo Rodriguez
|
a34358faa4
|
Fixing FormAuthenticateTest for Sqlsrv
|
2011-06-21 14:29:18 -04:30 |
|
Graham Weldon
|
3474837492
|
Fix error message for database configuration missing.
|
2011-06-21 11:42:35 -07:00 |
|
Graham Weldon
|
f1108b2ef1
|
Fixed pagination for SqlServer
|
2011-06-21 11:38:09 -07:00 |
|
Mark Story
|
c1e674f9c1
|
Actually checking that files exist before saying they do.
|
2011-06-21 10:45:01 -07:00 |
|
Jose Lorenzo Rodriguez
|
b722693102
|
Fixing all console tests on windows
|
2011-06-21 12:38:25 -04:30 |
|
Jose Lorenzo Rodriguez
|
552bd82b5b
|
Fixing tests from CommandListShell when run on windows
|
2011-06-21 12:14:36 -04:30 |
|
Jose Lorenzo Rodriguez
|
d54f8dc07a
|
Fixing some shell tests when that fail when they are run in window
|
2011-06-21 11:24:59 -04:30 |
|
Jose Lorenzo Rodriguez
|
f4aeb514e3
|
Fiing CakeSchema so it runs without errors on Sqlsrv
|
2011-06-21 11:13:33 -04:30 |
|
Thomas Ploch
|
5ffab8cde9
|
Added App::import('Model', 'ConnectionManager') to cake/libs/sanitize.php to prevent missing class errors.
|
2011-06-21 12:05:42 +02:00 |
|
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 |
|