silverstripe-framework/view
Damian Mooyman 8331171f2c Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
..
ArrayData.php Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:39:34 +13:00
GenericTemplateGlobalProvider.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
Requirements.php Fix missing media parameter on Requirements::combine_files 2015-05-11 17:30:59 +12: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 API Introduce $FromEnd variable for iterators 2015-04-09 17:02:30 +12: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 NEW ViewableData_Debugger implements __toString 2015-03-24 10:40:25 +00:00