silverstripe-cms/templates/Includes
Damian Mooyman 7dfe145412 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml
2016-01-20 13:16:43 +13:00
..
AssetAdmin_Content.ss Update asset admin toolbar 2015-10-30 10:05:51 +13:00
AssetAdmin_EditForm.ss MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
AssetAdmin_Tools.ss Move filters from panel to header 2015-06-24 09:58:48 +12:00
AssetAdmin_UploadContent.ss MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
CMSMain_Content.ss Update asset admin toolbar 2015-10-30 10:05:51 +13:00
CMSMain_EditForm.ss Updated templates to be more consistent and removed trailing spaces 2013-07-18 13:14:29 +02:00
CMSMain_ListView.ss MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
CMSMain_Tools.ss Add three column layout to Page content view 2015-07-02 10:23:37 +12:00
CMSMain_TreeView.ss Update the filtered tree styling 2015-08-25 13:02:20 +12:00
CMSPageAddController_Content.ss Updated templates to be more consistent and removed trailing spaces 2013-07-18 13:14:29 +02:00
CMSPageHistoryController_Tools.ss MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
CMSPagesController_Content.ss Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +13:00
CMSPagesController_ContentToolActions.ss FIX (partial) for #1288 where non-submit buttons are being activated on "enter" key press (relates to framework issue at https://github.com/silverstripe/silverstripe-framework/issues/3181). 2015-10-06 15:08:29 -04:00
CMSPagesController_Tools.ss Move filters from panel to header 2015-06-24 09:58:48 +12:00
Install_deleteinstallfiles.ss MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
Install_successfullyinstalled.ss Updated templates to be more consistent and removed trailing spaces 2013-07-18 13:14:29 +02:00
SubscribeSubmission.ss MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:42 +02:00