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
..
manifest	BUG Prevent live manifest loading files from nested test directories	2016-03-31 15:58:23 +13:00
startup	Merge 3 into master	2016-04-29 17:50:55 +12:00
ArrayDataTest.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +13:00
ArrayLibTest.php	Do not hang on nested parameters in search context	2015-09-23 09:12:02 +02:00
ClassInfoTest.php	BUG Ensure that filters on any fixed field are scoped to the base data table	2015-10-30 16:26:14 +13:00
ConfigTest.php	MINOR: Avoid access-changing subclass in test.	2016-03-22 17:39:09 +13:00
ConvertTest.php	Replaced obsolete mime types	2016-01-24 18:15:47 +13:00
CoreTest.php	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
DiffTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
HTMLCleanerTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
ObjectTest.php	API Extensible::invokeWithExtension has same method signature as Extensible::extend	2016-02-25 17:32:41 +13:00