silverstripe-framework/tests/core
Damian Mooyman 1e1a7a345c Merge remote-tracking branch 'origin/3'
Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php
2015-11-03 14:23:16 +13:00
..
manifest API Support trait loading 2015-09-24 11:57:45 +12:00
startup Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
ArrayDataTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12: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 API Disable deprecation notices by default 2015-07-16 09:56:47 +12:00
ConvertTest.php Url-safe alternative for base64_encode in resampled Image filenames 2015-08-05 20:59:40 +02:00
CoreTest.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +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 Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00