tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 01:49:37 +02:00
Code Issues Projects Releases Wiki Activity
c35b1c432f
silverstripe-framework/templates
History
Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13: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-02-20 10:17:19 +13:00
Includes Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13: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