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
..
Field_types	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-02 19:13:38 +12:00
How_Tos	DOCS: correct broken links	2015-02-27 16:09:15 -08:00
01_Validation.md	Update 01_Validation.md	2015-04-19 20:21:49 +12:00
03_Form_Templates.md	Rewrite, tidy and format of Forms documentation	2014-12-17 15:48:58 +13:00
04_Form_Security.md	Rewrite, tidy and format of Forms documentation	2014-12-17 15:48:58 +13:00
05_Form_Transformations.md	Rewrite, tidy and format of Forms documentation	2014-12-17 15:48:58 +13:00
06_Tabbed_Forms.md	Rewrite, tidy and format of Forms documentation	2014-12-17 15:48:58 +13:00
00_Introduction.md	DOCS Fix link to common subclasses of form fields	2015-05-23 17:30:09 +12:00
index.md	FIX How to folder on forms	2014-12-17 15:50:06 +13:00