silverstripe-framework/filesystem
Damian Mooyman 7ee444e08a Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	admin/code/LeftAndMain.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	filesystem/File.php
	model/DataObject.php
	model/DataQuery.php
	search/filters/FulltextFilter.php
	search/filters/SearchFilter.php
	tests/core/ClassInfoTest.php
	tests/filesystem/FileTest.php
	tests/model/DataListTest.php
2015-07-31 11:38:18 +12:00
..
File.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-07-31 11:38:18 +12:00
FileFinder.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
FileNameFilter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Filesystem.php API New Database abstraction layer. Ticket #7429 2014-07-09 18:04:05 +12:00
Folder.php API Revert DataObject::validate to 3.1 method signature (protected) 2015-06-16 11:59:21 +12:00
GD.php Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
ImagickBackend.php Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
Upload.php Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 11:24:25 +12:00