Ingo Schommer e6e12fe00e Merge branch '3.0' ...

Conflicts:
	composer.json

2012-11-22 23:48:18 +01:00

..

AssetAdmin.php

Merge branch '3.0'

2012-11-22 23:48:18 +01:00

CMSFileAddController.php

BUG: File Uploading Notifications (fixes #7883)

2012-10-16 18:43:10 +13:00

CMSMain.php

APICHANGE: Use late static binding for Object::has_extension()

2012-11-07 11:08:36 +13:00

CMSPageAddController.php

Method visibility according to coding conventions

2012-09-20 10:41:50 +02:00

CMSPageEditController.php

BUG Session namespace sharing for CMS controllers

2012-08-29 15:09:15 +02:00

CMSPageHistoryController.php

Method visibility according to coding conventions

2012-09-20 10:41:50 +02:00

CMSPagesController.php

Method visibility according to coding conventions

2012-09-20 10:41:50 +02:00

CMSPageSettingsController.php

Method visibility according to coding conventions

2012-09-20 10:41:50 +02:00

CMSSettingsController.php

ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change.

2012-10-05 16:27:13 +13:00

CMSSiteTreeFilter.php

MINOR Code refactoring of CMSMain::SearchForm() extracted some methods.

2012-11-02 23:52:24 +01:00

ContentController.php

Removed deprecated ContentController::LangAttributes()

2012-11-15 14:32:21 +13:00

ModelAsController.php

FIX Use RequestHandler::httpError() for all HTTP errors.

2012-09-27 12:56:56 +12:00

NestedController.php

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

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

ReportAdmin.php

Method visibility according to coding conventions

2012-09-20 10:41:50 +02:00

RootURLController.php

APICHANGE: Use late static binding for Object::has_extension()

2012-11-07 11:08:36 +13:00

SilverStripeNavigator.php

Method visibility according to coding conventions

2012-09-20 10:41:50 +02:00

StaticExporter.php

Method visibility according to coding conventions

2012-09-20 10:41:50 +02:00