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
e4ff3b8ec8
silverstripe-framework/admin/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
..
Includes Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
CMSBreadcrumbs.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
CMSDialog.ss MINOR Cleaned up CMS dialog styling (now works with/without tabs, in iframe and inline markup), removed superfluous SCSS variable declarations 2012-01-03 18:11:21 +01:00
CMSProfileController_Content.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
CMSTabSet.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
LeftAndMain_printable.ss MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
LeftAndMain.ss Side-by-side preview options fixes. 2012-12-10 17:52:01 +01:00
ModelSidebar.ss Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00