Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
ADmad
4c042ae133
Adding proper visibility keywords for class functions
2011-05-29 03:31:34 +05:30
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
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
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
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
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
268c061a2e
t
...
dividing language domains
cake - end user
cake_error - error messages
cake_developer - not an error, just for the developer
2011-03-19 18:16:12 +01:00
AD7six
38180e8951
translation changes in the model dir
2011-03-12 20:01:12 +01:00
Jose Lorenzo Rodriguez
ba694c45c9
Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading
2011-02-27 22:50:53 -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
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
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
b8344ecd33
Replacing some of the App::import by App::uses
2010-12-08 23:15:18 -04:30
José Lorenzo Rodríguez
513eb53426
Fixing package location in DboSource
2010-12-06 22:48:30 -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
8678661b9c
Merge branch 'feature/2.0/pdo' into 2.0-class-loading
2010-12-04 11:21:54 -04:30
José Lorenzo Rodríguez
592abb569c
More work towards loading datasources
2010-12-04 11:16:42 -04:30
