José Lorenzo Rodríguez
|
eedd823fd8
|
Merge remote branch 'origin/2.0' into feature/2.0/pdo
|
2010-11-03 00:23:18 -04:30 |
|
Mark Story
|
08e7bcb7ab
|
Merge branch '1.3' into integration
Conflicts:
app/config/core.php
cake/console/libs/acl.php
cake/console/templates/skel/config/core.php
cake/console/templates/skel/webroot/test.php
cake/dispatcher.php
cake/libs/view/errors/missing_action.ctp
cake/libs/view/helpers/form.php
cake/tests/cases/libs/cache/memcache.test.php
cake/tests/cases/libs/controller/controller.test.php
cake/tests/cases/libs/log/file_log.test.php
cake/tests/cases/libs/model/cake_schema.test.php
cake/tests/cases/libs/router.test.php
cake/tests/cases/libs/view/helpers/ajax.test.php
cake/tests/groups/bake.group.php
cake/tests/groups/behaviors.group.php
cake/tests/groups/i18n.group.php
cake/tests/groups/javascript.group.php
cake/tests/lib/reporter/cake_cli_reporter.php
|
2010-10-31 21:56:59 -04:00 |
|
José Lorenzo Rodríguez
|
1acb619e75
|
Implementing DboSource::insertMulti so it uses prepared statements, also changing internal uses of this method to reflect the new api, this brings as consequence a better abstracttion for datasources in model and fixtures, but breaks BC
|
2010-10-24 19:59:54 -04:30 |
|
mark_story
|
3ab77017ae
|
Fixing OpenTest license mentions to use MIT License
Fixing PHP versions 4 and 5 to only be PHP5.
|
2010-10-03 12:31:21 -04:00 |
|
mark_story
|
03d99d43be
|
Fixing unbalanced ob_start().
Removing dead code.
|
2010-09-24 23:30:00 -04:00 |
|
Mark Story
|
464d2217e6
|
Renaming model_behavior test to behavior_collection test as that's the class that contains the tested methods.
|
2010-09-06 13:51:42 -04:00 |
|