mark_story
|
e149c411fb
|
Merge branch '1.3' into merger
Conflicts:
cake/VERSION.txt
cake/config/config.php
cake/console/shells/tasks/template.php
cake/dispatcher.php
cake/libs/controller/component.php
cake/libs/controller/components/email.php
cake/libs/controller/scaffold.php
cake/libs/model/datasources/dbo/dbo_mysqli.php
cake/libs/view/helpers/cache.php
cake/libs/view/pages/home.ctp
cake/tests/cases/dispatcher.test.php
cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
cake/tests/fixtures/datatype_fixture.php
|
2011-02-05 12:20:09 -05:00 |
|
mark_story
|
2385d9c79a
|
Updating console class @package tags.
|
2010-12-24 14:26:26 -05:00 |
|
mark_story
|
ef77e60cb0
|
Removing @subpackage tags, moving contents of @subpackage into @package.
Removing duplicate cake.cake in @package tags.
Renaming cake.app -> app
|
2010-12-24 14:09:57 -05:00 |
|
José Lorenzo Rodríguez
|
c559b9c22d
|
Merge remote branch 'origin/2.0' into 2.0
Conflicts:
cake/console/templates/skel/config/database.php.default
cake/libs/model/datasources/dbo/dbo_sqlite.php
|
2010-12-05 20:51:37 -04:30 |
|
Juan Basso
|
c52d5320c8
|
Replaced the *printf with i18n aliases by i18n aliases with params.
|
2010-12-04 23:37:13 -02:00 |
|
José Lorenzo Rodríguez
|
2e04c5260e
|
Fixing some tests to make them run on sqlite
|
2010-12-02 00:19:43 -04:30 |
|
mark_story
|
18bb5f6b8b
|
Removing =& operators for construction of objects.
|
2010-11-12 23:05:44 -05:00 |
|
mark_story
|
e6ab0e22c7
|
Making schema shell work with app/console. No app prefix is needed.
|
2010-10-23 00:36:24 -04:00 |
|
mark_story
|
8c63f155ba
|
Renaming + moving test and task files around. Updating tests to use import for tasks.
|
2010-10-17 15:43:20 -04:00 |
|
mark_story
|
a76ce4af3d
|
Renaming console/libs to console/shells so its more consistent with app directories.
|
2010-10-17 15:07:00 -04:00 |
|