cakephp2-php8/cake/libs/view
Mark Story d88da3d579 Merge branch '1.3' into 2.0
Conflicts:
	cake/libs/configure.php
	cake/libs/model/connection_manager.php
	cake/libs/model/model.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	cake/tests/cases/libs/view/helpers/text.test.php
2010-09-06 16:53:04 -04:00
..
elements Adding a workaround to DboSource::showLog() to work around fix added in [da9c0da626]. 2010-08-26 21:24:09 -04:00
errors Adding omitted echo. 2010-05-29 00:20:16 -04:00
helpers Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -04:00
layouts Converted views, router and security classes to new translation shotcut function use. 2010-04-16 02:20:15 +10:00
pages Merge branch '1.3' into 2.0 2010-07-24 22:34:42 -04:00
scaffolds Converted views, router and security classes to new translation shotcut function use. 2010-04-16 02:20:15 +10:00
helper.php Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -04:00
helper_collection.php Fixing failing tests in Dispatcher.test. 2010-08-28 00:19:09 -04:00
media.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
theme.php Removing ability to register View and ThemeView into ClassRegistry. 2010-08-10 23:18:41 -04:00
view.php Merge branch '2.0-exceptions' into 2.0 2010-08-28 00:14:34 -04:00