silverstripe-framework

mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00

History

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

code

Merge remote-tracking branch 'origin/3'

2015-11-03 14:23:16 +13:00

css

Send user to new area when inserting url

2015-10-29 11:37:59 +13:00

font

Update asset admin toolbar

2015-10-23 17:39:42 +13:00

images

Move 'upload new file' section to main files area