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
..
fixtures/filefinder	FEATURE: Added the SS_FileFinder class for finding files within a directory true that match a set of rules.	2011-03-24 20:14:42 +11:00
gdtest	API Refactor of File / Folder to use DBFile	2015-10-13 11:57:39 +13:00
AssetAdapterTest.php	BUG move test file to correct folder and fix class_exists	2016-03-31 17:06:23 +13:00
AssetControlExtensionTest.php	API Update Versioned methods	2016-04-04 14:50:16 +12:00
AssetManipulationListTest.php	API File has Versioned extension	2016-02-23 13:46:28 +13:00
AssetStoreTest.php	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace	2016-03-22 18:09:30 +13:00
DefaultAssetNameGeneratorTest.php	API Refactor of File / Folder to use DBFile	2015-10-13 11:57:39 +13:00
FileFinderTest.php	MINOR Update @package values to match renaming sapphire	2012-04-15 10:50:19 +12:00
FileMigrationHelperTest.php	API Massive refactor of Versioned	2016-03-17 13:43:53 +13:00
FileMigrationHelperTest.yml	API Refactor of File / Folder to use DBFile	2015-10-13 11:57:39 +13:00
FileNameFilterTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
FileTest.php	API Update Versioned methods	2016-04-04 14:50:16 +12:00
FileTest.yml	API Refactor of File / Folder to use DBFile	2015-10-13 11:57:39 +13:00
FolderTest.php	API Update Versioned methods	2016-04-04 14:50:16 +12:00
GDTest.php	Merge 3 into master	2016-04-29 17:50:55 +12:00
ProtectedFileControllerTest.php	API Change in behaviour to flysystem reporting for root folders	2016-04-26 09:36:08 +12:00
UploadTest.php	Merge 3 into master	2016-04-29 17:50:55 +12:00