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
b8335793d6
silverstripe-framework/admin/templates
History
Daniel Hensby a8ab5a468d Merge branch '3.1' into 3.2 
Conflicts:
	admin/code/LeftAndMain.php
	composer.json
2015-08-17 11:43:28 +01:00
..
Includes Merge branch '3.1' into 3.2 2015-08-17 11:43:28 +01: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 admin/myprofile layout after validation (fixes #2644) 2013-11-07 16:19:40 +01:00
CMSSecurity_login.ss API Enable re-authentication within the CMS if a user session is lost 2014-10-14 15:19:48 +13:00
CMSSecurity_success.ss API Enable re-authentication within the CMS if a user session is lost 2014-10-14 15:19:48 +13: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 API Enable re-authentication within the CMS if a user session is lost 2014-10-14 15:19:48 +13:00
ModelSidebar.ss Fixed merge error (mainly new translation entity format in templates) 2013-08-09 15:27:28 +02:00