Damian Mooyman c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3 ...

Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php

2015-11-03 13:06:39 +13:00

..

email

Upgrade template translation syntax

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

forms

BUG Fix duplicate HolderID on TreeDropdownField

2015-10-06 12:54:35 +13:00

Includes

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

AssetUploadField.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

BlankPage.ss

MINOR HTML5 for BlankPage.ss default template

2012-04-13 15:32:05 +02:00

Controller.ss

MINOR Closing tag in Controller.ss

2014-12-04 15:41:10 +01:00

GridFieldDetailForm.ss

API CHANGE: Renaming of gridfield components #6921

2012-03-09 12:54:02 +13:00

HtmlEditorField_UploadField.ss

Upgrade template translation syntax

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

Image_iframe.ss

Upgrade template translation syntax

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

RightLabelledFieldHolder.ss

Updated loop/if/with to be more consistent

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

RSSFeed.ss

Updated loop/if/with to be more consistent

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

SapphireInfo.ss

API-CHANGE sapphire folder can now be renamed.

2012-04-15 10:50:19 +12:00

SearchForm.ss

Updated loop/if/with to be more consistent

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

UploadField_FileEdit.ss

ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField

2012-02-03 01:00:08 +01:00

UploadField.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