Ingo Schommer f3c0669fec Merge remote-tracking branch 'origin/3.0' into 3.1 ... Conflicts: _config/uploadfield.yml css/UploadField.css forms/UploadField.php scss/UploadField.scss templates/UploadField.ss tests/forms/uploadfield/UploadFieldTest.php		2013-01-11 10:02:39 +01:00
..
email	BUG Fully qualified namespace for _t() in templates	2012-08-06 13:44:21 +02:00
forms	NEW Tooltip and inline help text support for CMS form fields	2012-12-14 01:58:04 +01:00
Includes	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-11 10:02:39 +01:00
AssetUploadField.ss	NEW Show the allowed extensions as a toggle tip as per trac 7993	2012-12-19 17:00:39 +01:00
BlankPage.ss	MINOR HTML5 for BlankPage.ss default template	2012-04-13 15:32:05 +02:00
Controller.ss	Include in basic Controller view	2012-09-19 21:00:43 +12:00
GridFieldDetailForm.ss	API CHANGE: Renaming of gridfield components #6921	2012-03-09 12:54:02 +13:00
HtmlEditorField_UploadField.ss	i18n for "select an anchor" string (see #7798)	2012-08-26 23:58:31 +02:00
Image_iframe.ss	BUG Fully qualified namespace for _t() in templates	2012-08-06 13:44:21 +02:00
RightLabelledFieldHolder.ss	Moved Sapphire module to open source path	2007-07-19 10:40:28 +00:00
RSSFeed.ss	MINOR Fixing use of <% control %> with <% with %> or <% loop %> as necessary.	2012-05-11 13:49:20 +12:00
SapphireInfo.ss	API-CHANGE sapphire folder can now be renamed.	2012-04-15 10:50:19 +12:00
SearchForm.ss	MINOR Fixing use of <% control %> with <% with %> or <% loop %> as necessary.	2012-05-11 13:49:20 +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	Merge remote-tracking branch 'origin/3.0' into 3.1	2013-01-11 10:02:39 +01:00