silverstripe-framework/view
Damian Mooyman 43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php
2015-03-31 19:54:15 +13:00
..
ArrayData.php Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
GenericTemplateGlobalProvider.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
Requirements.php Merge pull request #3432 from IgorNadj/3.1-fix-minify 2015-02-06 11:17:59 +00:00
SSTemplateParser.php Merge remote-tracking branch 'origin/3.1' into 3 2015-03-31 19:54:15 +13:00
SSTemplateParser.php.inc Merge remote-tracking branch 'origin/3.1' into 3 2015-03-31 19:54:15 +13:00
SSViewer.php Merge remote-tracking branch 'origin/3.1' into 3 2015-03-31 19:54:15 +13:00
TemplateGlobalProvider.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
TemplateIteratorProvider.php Remove end php tag from TemplateIteratorProvider 2012-10-10 11:15:55 +13:00
TemplateParser.php Feature to allow that changing the SSTemplateParser through the Injector system 2013-10-18 12:42:39 +13:00
ViewableData.php Refactor ViewableData::obj caching 2015-03-09 10:32:37 +13:00