Damian Mooyman 208497ea42 Merge remote-tracking branch 'origin/3.2' into 3.3 ...

# Conflicts:
#	lang/en.yml
#	lang/lt.yml

2016-02-24 17:32:58 +13:00

..

AssetAdmin.php

BUG Prevent folders deleted on the filesystem from breaking asset interface

2016-02-09 13:03:40 +13: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

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

2016-02-24 17:32:58 +13: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

BUG Fix legacy breadcrumbs appearing on page save

2016-01-20 15:29:51 +13: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

fixing phpdoc blocks to refering to Objects to built-in types of PHP

2015-09-28 22:31:31 +13: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

fixing phpdoc blocks to refering to Objects to built-in types of PHP

2015-09-28 22:31:31 +13:00

ContentController.php

Merge pull request #1342 from mejt/3

2015-12-22 16:58:04 +13:00

ErrorPageControllerExtension.php

API Error page support for Security controller errors

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

LeftAndMainPageIconsExtension.php

fixing phpdoc blocks to refering to Objects to built-in types of PHP

2015-09-28 22:31:31 +13:00

ModelAsController.php

UPDATE: make all response code use getResponse() method

2015-09-25 09:10:24 +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

UPDATE: make all response code use getResponse() method

2015-09-25 09:10:24 +12:00

SilverStripeNavigator.php

fixing phpdoc blocks to refering to Objects to built-in types of PHP

2015-09-28 22:31:31 +13:00