Damian Mooyman f2efbefb8c Merge remote-tracking branch 'origin/3.1' into 3.2 ...

Conflicts:
	.travis.yml

2015-09-09 14:09:00 +12:00

..

AssetAdmin.php

Moved image thumbnail style rules to Framework

2015-07-30 16:15:35 -07:00

CMSFileAddController.php

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:02 +12:00

CMSMain.php

API batch restore action

2015-08-03 20:57:30 +12:00

CMSPageAddController.php

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:02 +12:00

CMSPageEditController.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:21:04 +01:00

CMSPageHistoryController.php

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:02 +12:00

CMSPagesController.php

UPDATE: change all instances of $this->request to use appropriate getter/setter

2015-04-30 11:04:02 +12:00

CMSPageSettingsController.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:21:04 +01:00

CMSSettingsController.php

increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain

2015-06-22 14:15:49 +02:00

CMSSiteTreeFilter.php

Fix missing packages

2015-08-24 16:14:33 +12:00

ContentController.php

FIX: ContentController::getViewer() not returning all found templates (fixes #1244)

2015-07-24 11:50:09 +01:00

ErrorPageControllerExtension.php

API Error page support for Security controller errors

2014-05-05 17:13:11 +12:00

LeftAndMainPageIconsExtension.php

Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798)

2013-07-31 09:30:58 +01:00

ModelAsController.php

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 12:00:42 +12:00

NestedController.php

Code cleanup: removed trailing ?> markers per code standard.

2012-02-13 12:48:41 -08:00

OldPageRedirector.php

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-09-09 14:09:00 +12:00

RootURLController.php

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 12:00:42 +12:00

SilverStripeNavigator.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:42 +13:00