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
|
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
|
7dc8d5e746
|
Simplifying datasources loading, it now requires datasources to be configured with the 'datasource' array key, which is a relative path from Model/Datasource/
|
2010-12-04 12:24:15 -04:30 |
|
José Lorenzo Rodríguez
|
be1263d476
|
Moving the first database driver to the correct folder to start testing
|
2010-12-04 11:52:23 -04:30 |
|