tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
0a0ac86f5b
silverstripe-cms/code/controllers
History
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.php Merge remote-tracking branch 'origin/3' 2015-11-03 14:23:04 +13:00
CMSMain.php Merge remote-tracking branch 'origin/3.2' into 3 2015-11-03 13:11:26 +13:00
CMSPageAddController.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +13:00
CMSPageEditController.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:21:04 +01:00
CMSPageHistoryController.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +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 Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +13:00
ContentController.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +13:00
ErrorPageControllerExtension.php MINOR: Remove training whitespace. 2016-01-07 10:32:05 +13:00
LeftAndMainPageIconsExtension.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +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 Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:43 +13:00