Damian Mooyman d7d6fd8758 Merge 3 into master ... # Conflicts: # code/controllers/CMSPageAddController.php # code/model/ErrorPage.php # composer.json # css/screen.css # tests/behat/features/insert-a-link.feature		2016-04-29 14:34:29 +12:00
..
AssetAdmin.php	Adjust file paths for new static file structure in framework	2016-04-20 21:13:20 +12:00
CMSMain.php	Cleanup PHPDoc and use injector for AddToCampaignHandler	2016-04-26 11:56:37 +12:00
CMSPageAddController.php	Merge 3 into master	2016-04-29 14:34:29 +12:00
CMSPageEditController.php	BUG Fix legacy breadcrumbs appearing on page save	2016-01-20 15:29:51 +13:00
CMSPageHistoryController.php	Cleanup trailing whitespace	2016-03-09 10:28:45 +13:00
CMSPagesController.php	Merge remote-tracking branch 'origin/3'	2015-11-03 14:23:04 +13:00
CMSPageSettingsController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
CMSSettingsController.php	increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain	2015-06-22 14:15:49 +02:00
CMSSiteTreeFilter.php	Cleanup trailing whitespace	2016-03-09 10:28:45 +13:00
ContentController.php	Adjust file paths for new static file structure in framework	2016-04-20 21:13:20 +12:00
ErrorPageControllerExtension.php	API Support versioned File management	2016-02-22 12:25:25 +13:00
ErrorPageFileExtension.php	API Support versioned File management	2016-02-22 12:25:25 +13:00
LeftAndMainPageIconsExtension.php	Cleanup trailing whitespace	2016-03-09 10:28:45 +13:00
ModelAsController.php	Decouple ErrorPage	2016-01-05 15:00:38 -08:00
NestedController.php	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
OldPageRedirector.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
RootURLController.php	remove trailing spaces in the codebase	2015-09-29 17:18:03 +13:00
SilverStripeNavigator.php	API Update to use new Versioned API	2016-03-17 13:44:26 +13:00