Damian Mooyman 3b0a9f4ba2 Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/javascript/LeftAndMain.Menu.js # control/HTTPRequest.php # css/GridField.css # css/GridField.css.map # docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.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/01_File_Management.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # filesystem/Upload.php # javascript/HtmlEditorField.js # model/Image.php # model/connect/MySQLDatabase.php # model/fieldtypes/Enum.php # model/versioning/Versioned.php # scss/GridField.scss		2016-02-25 14:51:59 +13:00
..
flysystem	Update Nginx rules	2016-01-13 18:18:22 +13:00
storage	API File has Versioned extension	2016-02-23 13:46:28 +13:00
AssetAdapterTest.php	API Asset Access Control implementation	2016-01-13 18:18:22 +13:00
AssetControlExtension.php	API File has Versioned extension	2016-02-23 13:46:28 +13:00
AssetManipulationList.php	API File has Versioned extension	2016-02-23 13:46:28 +13:00
File.php	API File has Versioned extension	2016-02-23 13:46:28 +13:00
FileFinder.php	API Marked statics private, use Config API instead (#8317)	2013-03-24 17:20:53 +01:00
FileMigrationHelper.php	API File has Versioned extension	2016-02-23 13:46:28 +13:00
FileNameFilter.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
Filesystem.php	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
Folder.php	API Asset Access Control implementation	2016-01-13 18:18:22 +13:00
GDBackend.php	API Asset Access Control implementation	2016-01-13 18:18:22 +13:00
ImageManipulation.php	API Asset Access Control implementation	2016-01-13 18:18:22 +13:00
ImagickBackend.php	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
Upload.php	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +13:00