tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 09:59:32 +02:00
Code Issues Projects Releases Wiki Activity
a9efe4d253
silverstripe-framework/admin
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 2015-09-28 12:02:33 +13:00
javascript Merge remote-tracking branch 'origin/3' 2015-11-03 14:23:16 +13:00
scss Send user to new area when inserting url 2015-10-29 11:37:59 +13:00
templates Update asset admin toolbar 2015-10-23 17:39:42 +13:00
tests BUG Fix missing framework/admin/tests 2015-09-10 11:06:15 +12:00
thirdparty update cms notifications 2015-09-02 15:47:48 +12:00
_config.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
.gitignore MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
config.rb Update compass config 2015-07-09 10:11:00 +12:00