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

..

AssetField_FileButtons.ss

API Implement AssetField to edit DBFile fields

2015-10-23 16:57:44 +13:00

Form.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

GridField_FormAction.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

GridField_Item.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

GridField_print.ss

Upgrade template translation syntax

2015-07-22 14:17:03 +01:00

GridFieldAddExistingAutocompleter.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

GridFieldAddNewButton.ss

ENHANCEMENT: Make GridFieldAddNewButton Content more specific

2012-05-21 17:47:14 +12:00

GridFieldButtonRow.ss

FIX: GridField button styling

2013-06-21 14:22:00 +01:00

GridFieldEditButton.ss

Upgrade template translation syntax

2015-07-22 14:17:03 +01:00

GridFieldFilterHeader_Row.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

GridFieldFooter.ss

Upgrade template translation syntax

2015-07-22 14:17:03 +01:00

GridFieldItemEditView.ss

Upgrade template translation syntax

2015-07-22 14:17:03 +01:00

GridFieldLevelup.ss

Update asset admin toolbar

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

GridFieldPageCount.ss

Upgrade template translation syntax

2015-07-22 14:17:03 +01:00

GridFieldPaginator_Row.ss

Upgrade template translation syntax

2015-07-22 14:17:03 +01:00

GridFieldSortableHeader_Row.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

GridFieldToolbarHeader.ss

Updated loop/if/with to be more consistent

2013-07-14 20:43:52 +12:00

GridFieldViewButton.ss

FEATURE: Implemented a view action for GridField, and a record viewing GridFieldConfig.

2012-05-12 18:49:56 +10:00

HtmlEditorField_viewfile.ss

FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press (relates to CMS issue at https://github.com/silverstripe/silverstripe-cms/issues/1288).

2015-10-06 15:03:49 -04:00

LeftAndMain_ViewModeSelector.ss

Update view mode section w/ font icons

2015-09-01 10:54:52 +12:00

Security_MultiAuthenticatorLogin.ss

AJAX friendly responses for Security class

2013-04-26 12:29:35 +01:00

UploadField_FileButtons.ss

FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press (relates to CMS issue at https://github.com/silverstripe/silverstripe-cms/issues/1288).

2015-10-06 15:03:49 -04:00