Damian Mooyman d52db0ba34 Merge 3 into master ... # Conflicts: # .travis.yml # admin/css/ie7.css # admin/css/ie7.css.map # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.js # admin/scss/_style.scss # admin/scss/_uitheme.scss # control/HTTPRequest.php # core/Object.php # css/AssetUploadField.css # css/AssetUploadField.css.map # css/ConfirmedPasswordField.css.map # css/Form.css.map # css/GridField.css.map # css/TreeDropdownField.css.map # css/UploadField.css # css/UploadField.css.map # css/debug.css.map # dev/Debug.php # docs/en/00_Getting_Started/00_Server_Requirements.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md # filesystem/File.php # filesystem/Folder.php # filesystem/GD.php # filesystem/Upload.php # forms/ToggleField.php # forms/Validator.php # javascript/lang/en_GB.js # javascript/lang/fr.js # javascript/lang/src/en.js # javascript/lang/src/fr.js # model/Image.php # model/UnsavedRelationList.php # model/Versioned.php # model/connect/MySQLDatabase.php # model/fieldtypes/DBField.php # model/fieldtypes/Enum.php # scss/AssetUploadField.scss # scss/UploadField.scss # templates/email/ChangePasswordEmail.ss # templates/forms/DropdownField.ss # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php # tests/forms/EnumFieldTest.php # tests/security/MemberTest.php # tests/security/MemberTest.yml # tests/security/SecurityTest.php		2016-04-29 17:50:55 +12:00
..
gridfield	Merge 3 into master	2016-04-29 17:50:55 +12:00
images	API Refactor of File / Folder to use DBFile	2015-10-13 11:57:39 +13:00
uploadfield	API Massive refactor of Versioned	2016-03-17 13:43:53 +13:00
CheckboxFieldTest.php	FEATURE: add validation to form field subclasses	2014-11-17 08:17:38 +13:00
CheckboxSetFieldTest.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
CheckboxSetFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
CompositeFieldTest.php	NEW: Implement unshift() in field list classes (closes #4834)	2015-12-14 16:18:57 +00:00
ConfirmedPasswordFieldTest.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
CurrencyFieldTest.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +13:00
DateFieldTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
DatefieldViewJQueryTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
DatetimeFieldTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
DBFileTest.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
DropdownFieldTest.php	API Cleanup and refactor of select fields	2016-01-21 15:40:19 +13:00
EmailFieldTest.php	UPDATE: change all instances of $this->request to use appropriate getter/setter	2015-04-30 11:04:08 +12:00
EnumFieldTest.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
FieldGroupTest.php	FIX: Hidden errors for composite fields nested inside FieldGroups (fixes #4773)	2015-11-17 16:34:17 +00:00
FieldListTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
FileFieldTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
FormActionTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
FormFieldTest.php	Form field schema state	2016-03-03 13:36:48 +13:00
FormScaffolderTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
FormScaffolderTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
FormSchemaTest.php	Add DetailEditForm to Campaign admin	2016-04-26 15:32:07 +12:00
FormTest.php	Docs and tests for exempt validation actions	2016-04-22 14:52:38 +12:00
FormTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GridFieldTest.php	MINOR: Fix PHPUnit @covers assertions for GridFieldTest	2016-03-26 11:55:01 +13:00
GroupedDropdownFieldTest.php	API Cleanup and refactor of select fields	2016-01-21 15:40:19 +13:00
HtmlEditorConfigTest.php	BUG fix missing language on non-global configs	2016-04-04 09:59:31 +12:00
HtmlEditorFieldTest.php	API TinyMCE Image shortcodes	2016-03-21 09:23:40 +13:00
HtmlEditorFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
HtmlEditorSanitiserTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
InlineFormActionTest.php	BUG Fix broken InlineFormAction	2015-10-29 10:48:49 +13:00
ListboxFieldTest.php	API Cleanup and refactor of select fields	2016-01-21 15:40:19 +13:00
ListboxFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
LookupFieldTest.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +13:00
LookupFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MemberDatetimeOptionsetFieldTest.php	API Cleanup and refactor of select fields	2016-01-21 15:40:19 +13:00
MemberDatetimeOptionsetFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
MoneyFieldTest.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +13:00
NullableFieldTests.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
NumericFieldTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
OptionsetFieldTest.php	FIX: Allow omitting a value for OptionsetField submissions (fixes #4824)	2015-12-14 16:50:22 +00:00
RequiredFieldsTest.php	removeRequiredField() limits field (fixes #2165)	2013-09-27 19:58:59 +02:00
RequirementsTest_a.css	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
RequirementsTest_a.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
RequirementsTest_b.css	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
RequirementsTest_b.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
RequirementsTest_c.css	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
RequirementsTest_c.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
RequirementsTest_print_a.css	API Add possibility to combine media-targeting stylesheets.	2013-02-13 11:04:05 +13:00
RequirementsTest_print_b.css	API Add possibility to combine media-targeting stylesheets.	2013-02-13 11:04:05 +13:00
RequirementsTest.php	BUG Fix issue with Requirements mangling custom scripts (#5337)	2016-04-19 17:20:30 +12:00
SelectionGroupTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
TextareaFieldTest.php	API Update TinyMCE to 4.x	2016-02-23 10:10:02 +13:00
TextFieldTest.php	Implement validate() method for TextField to validate max length (closes #4073)	2015-05-19 09:36:51 +01:00
TimeFieldTest.php	Merge remote-tracking branch 'origin/3.1' into 3.2	2015-06-19 10:48:07 +12:00
TreeDropdownFieldTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
TreeDropdownFieldTest.yml	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00