Ingo Schommer 53c2059a01 Merge remote-tracking branch 'origin/3.0' into 3.1 ...

Conflicts:
	code/controllers/SilverStripeNavigator.php

2013-02-07 21:44:41 +01:00

..

AssetAdmin.php

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

2012-12-14 10:55:51 +01:00

CMSFileAddController.php

BUG: File Uploading Notifications (fixes #7883)

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

CMSMain.php

More useful default cols on "Pages" list (fixes #8199)

2013-01-22 15:37:20 +01:00

CMSPageAddController.php

Fixed "add page" type icons (fixes #8190)

2013-01-17 19:59:54 +01:00

CMSPageEditController.php

Consistent naming for root breadcrumb on page controllers (fixes #8057)

2012-11-29 14:43:37 +01:00

CMSPageHistoryController.php

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

2013-02-07 21:44:41 +01:00

CMSPagesController.php

Method visibility according to coding conventions

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

CMSPageSettingsController.php

Consistent naming for root breadcrumb on page controllers (fixes #8057)

2012-11-29 14:43:37 +01:00

CMSSettingsController.php

BUG Hiding group selections in "Settings"

2012-12-15 20:01:05 +01:00

CMSSiteTreeFilter.php

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

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

ContentController.php

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

2013-01-30 12:44:40 +01: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

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

2013-02-07 21:44:41 +01:00

StaticExporter.php

Method visibility according to coding conventions

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