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
..
AssetUploadField.css	Merge 3 into master	2016-04-29 17:50:55 +12:00
CheckboxSetField.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
ConfirmedPasswordField.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
DatetimeField.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
debug.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
Form.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
GridField_print.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
GridField.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
Security_login.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
SelectionGroup.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
TreeDropdownField.css	API Moved frontend assets into admin/client/	2016-04-20 21:13:10 +12:00
UploadField.css	Merge 3 into master	2016-04-29 17:50:55 +12:00