silverstripe-framework/admin/code
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
..
AdminRootController.php FEATURE: implement getter and setter usage for response 2015-08-29 10:24:06 +12:00
CMSBatchAction.php API Deprecate delete in favour of archive 2015-06-03 14:24:27 +12:00
CMSBatchActionHandler.php BUG Fix regressions in changes to batch action feature 2015-06-23 16:28:25 +12:00
CMSForm.php Form action validation excempts 2014-11-26 22:49:37 +13:00
CMSMenu.php Convert FQCNs to html safe strings 2015-07-15 15:33:00 +01:00
CMSMenuItem.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CMSPreviewable.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CMSProfileController.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-09-09 14:35:29 +12:00
GroupImportForm.php Update translations 2015-08-24 16:52:39 +12:00
LeftAndMain.php Merge remote-tracking branch 'origin/3' 2015-09-09 15:44:47 +12:00
LeftAndMainExtension.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
MemberImportForm.php Update translations 2015-08-24 16:52:39 +12:00
ModelAdmin.php Do not hang on nested parameters in search context 2015-09-23 09:12:02 +02:00
SecurityAdmin.php Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00