tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
98d676bfdc
silverstripe-framework/templates
History
Ingo Schommer afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss
2013-08-07 17:14:47 +02:00
..
email Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
forms Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
Includes Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +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