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
htmleditor	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
AssetField.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
CheckboxField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
CheckboxSetField.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
CompositeField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
ConfirmedPasswordField.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
CountryDropdownField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
CreditCardField.php	FIX: remove validation type constraint from form fields for 3.2 release	2015-05-11 12:32:00 +12:00
CurrencyField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
DatalessField.php	DOCS Fixing docs (and bad API usage)	2015-07-20 16:42:33 +01:00
DateField.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
DatetimeField.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
DisabledTransformation.php	Method visibility according to coding conventions	2012-09-20 10:46:59 +02:00
DropdownField.php	API Add isDisabledValue to SelectField	2016-01-21 15:40:19 +13:00
EmailField.php	FIX: remove validation type constraint from form fields for 3.2 release	2015-05-11 12:32:00 +12:00
FieldGroup.php	FIX: Hidden errors for composite fields nested inside FieldGroups (fixes #4773)	2015-11-17 16:34:17 +00:00
FieldList.php	API File has Versioned extension	2016-02-23 13:46:28 +13:00
FileField.php	API Refactor of File / Folder to use DBFile	2015-10-13 11:57:39 +13:00
Form.php	Docs and tests for exempt validation actions	2016-04-22 14:52:38 +12:00
FormAction.php	API Allow actions to declare they are exempt from validation themselves	2016-04-22 14:22:11 +12:00
FormField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
FormScaffolder.php	API Consolidate DataObject db methods	2015-09-22 10:38:12 +12:00
FormSchema.php	BUG Fix form schema to use correct ID values	2016-04-26 15:32:08 +12:00
FormTemplateHelper.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
FormTransformation.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
GroupedDropdownField.php	API Cleanup and refactor of select fields	2016-01-21 15:40:19 +13:00
HeaderField.php	Merge remote-tracking branch 'origin/3.1' into 3	2015-06-17 11:24:25 +12:00
HiddenField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
HtmlEditorSanitiser.php	Rewrote usages of error suppression operator	2014-03-05 15:48:55 +13:00
InlineFormAction.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
LabelField.php	Clean up LabelField	2015-04-30 16:21:33 +12:00
ListboxField.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
LiteralField.php	Clean up LiteralField	2015-04-30 11:53:02 +12:00
LookupField.php	API Cleanup and refactor of select fields	2016-01-21 15:40:19 +13:00
MemberDatetimeOptionsetField.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
MoneyField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
MultiSelectField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
NestedForm.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
NullableField.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +13:00
NumericField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
OptionsetField.php	Cleanup trailing whitespace	2016-03-09 10:20:31 +13:00
PasswordField.php	Clean up PasswordField	2015-04-30 11:20:46 +12:00
PhoneNumberField.php	DOCS Fixing docs (and bad API usage)	2015-07-20 16:42:33 +01:00
PrintableTransformation.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
ReadonlyField.php	BUG Fix missing return in ReadonlyField	2016-04-26 16:57:07 +12:00
ReadonlyTransformation.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
RequiredFields.php	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 13:07:41 +12:00
ResetFormAction.php	Method visibility according to coding conventions	2012-09-20 10:46:59 +02:00
SelectField.php	API Add isDisabledValue to SelectField	2016-01-21 15:40:19 +13:00
SelectionGroup.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
SingleSelectField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
Tab.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
TabSet.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
TabularStyle.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
TextareaField.php	API Update TinyMCE to 4.x	2016-02-23 10:10:02 +13:00
TextField.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
TimeField.php	Defined $schemaDataType constant, added to FormField subclasses	2016-03-30 23:00:00 +13:00
ToggleCompositeField.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
TreeDropdownField.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
TreeMultiselectField.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
UploadField.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
Validator.php	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00