silverstripe-framework/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 Update YAML component, load via composer 2015-10-19 17:06:25 +01:00
startup Add missing packages 2015-08-24 16:15:38 +12:00
ArrayLib.php Do not hang on nested parameters in search context 2015-09-23 09:12:02 +02:00
ClassInfo.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-11-03 11:10:46 +13:00
Config.php Remove unused local vars 2015-08-03 20:42:43 +02:00
Constants.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
Convert.php Url-safe alternative for base64_encode in resampled Image filenames 2015-08-05 20:59:40 +02:00
Core.php NEW Update SS_ConfigStaticManifest to use Reflection 2015-09-03 22:25:42 +00:00
DAG.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Diff.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Extension.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Flushable.php NEW Provide a consistent way of triggering flush 2014-08-22 09:24:27 +12:00
HTMLCleaner.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Object.php Merge remote-tracking branch 'origin/3' 2015-11-03 14:23:16 +13:00
PaginatedList.php Merge remote-tracking branch 'origin/3' 2015-11-03 14:23:16 +13:00
TempPath.php Remove unused local vars 2015-08-03 20:42:43 +02:00