Damian Mooyman 0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: admin/code/LeftAndMain.php forms/EmailField.php forms/Form.php forms/HeaderField.php forms/LiteralField.php forms/PasswordField.php forms/TextareaField.php forms/TreeDropdownField.php model/DataObject.php tests/forms/uploadfield/UploadFieldTest.php tests/model/DataObjectTest.php		2015-06-17 11:24:25 +12: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' into 3	2015-06-17 11:24:25 +12:00
Includes	API New and renamed image functions	2015-06-12 17:02:55 -07: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	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	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	FIX: Defer loading of UploadField EditForm iframes (fixes #2711)	2013-12-19 09:11:31 +00:00