Commit graph

6 commits

Author SHA1 Message Date
Jose Lorenzo Rodriguez
febf28f34b Merge remote-tracking branch 'origin/1.3' into 2.0
Conflicts:
	cake/console/templates/default/views/home.ctp
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/media.test.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/test_app/views/pages/home.ctp
	lib/Cake/Cache/Engine/ApcEngine.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/View/Helper/FormHelper.php
2011-07-25 14:44:23 -04:30
Robert Sworder
fb3a1928d3 Minor comment and path changes. 2011-06-25 15:08:41 +01:00
Mark Story
f547032f6f Removing altrow from the bake default templates.
Refs #306
2011-06-22 13:14:31 -07:00
Renan Gonçalves
2e3f828098 Updating the home.ctp file to include last changes made on directories name and i18n usage. 2011-06-12 23:24:42 +02:00
Vitor Pacheco
bfa7c12866 printing the legend of the forms in the templates 2011-06-04 14:42:22 -03:00
Juan Basso
21348169fa Camelized templates folder. 2011-05-30 23:02:39 -04:00