tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-29 16:09:23 +02:00
Code Issues Projects Releases Wiki Activity
dff65867cc
silverstripe-framework/view
History
Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +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' 2014-11-18 12:45:54 +13:00
SSTemplateParser.php.inc Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
SSViewer.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +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 Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00