Hamish Friedlander 0a79ac3592 Merge branch 'origin/3.1' ... Conflicts: templates/forms/CheckboxSetField.ss templates/forms/FormField_holder.ss templates/forms/OptionsetField.ss		2013-07-19 16:25:38 +12:00
..
email	removing potentially invalid html in email	2013-04-16 10:38:08 +02:00
forms	Merge branch 'origin/3.1'	2013-07-19 16:25:38 +12:00
Includes	Merge branch 'origin/3.1'	2013-07-19 16:25:38 +12: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	Updated loop/if/with to be more consistent	2013-07-14 20:43:52 +12: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