Ingo Schommer 7ae75c1a89 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	forms/HtmlEditorField.php

2013-08-16 13:37:44 +02:00

..

email

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-08-07 17:14:47 +02:00

forms

Merge remote-tracking branch 'origin/3.1'

2013-08-16 13:37:44 +02:00

Includes

Merge remote-tracking branch 'origin/3.1'

2013-08-07 17:34:11 +02:00

AssetUploadField.ss

BUGFIX:fixed styling of asset upload page and dialog in the asset admin and media insert via WYSIWYG editor open/8231.

2013-02-04 14:15:27 +13:00

BlankPage.ss

MINOR HTML5 for BlankPage.ss default template

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

Controller.ss

Fix typo in templates/Controller.ss

2013-01-23 23:55:34 +01:00

GridFieldDetailForm.ss

API CHANGE: Renaming of gridfield components #6921

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

HtmlEditorField_UploadField.ss

BUGFIX:fixed styling of asset upload page and dialog in the asset admin and media insert via WYSIWYG editor open/8231.

2013-02-04 14:15:27 +13:00

Image_iframe.ss

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-08-07 17:14:47 +02: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

Updated loop/if/with to be more consistent

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