Simon Welsh b497b8f548 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml
	code/reports/Report.php

2014-03-18 09:23:39 +13:00

..

AssetAdmin.php

Numerous PHPDoc fixes.

2014-02-10 15:35:13 -05:00

CMSFileAddController.php

FIX fileexists check via ajax didnt know what folder the file was being uploaded to. Fixes #950

2014-02-20 15:17:04 +11:00

CMSMain.php

Numerous PHPDoc fixes.

2014-02-10 15:35:13 -05:00

CMSPageAddController.php

Implement History.js logic for "Cancel" action

2013-11-22 12:46:03 +01:00

CMSPageEditController.php

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

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

CMSPageHistoryController.php

Numerous PHPDoc fixes.

2014-02-10 15:35:13 -05:00

CMSPagesController.php

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

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

CMSPageSettingsController.php

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

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

CMSSettingsController.php

Merge branch '3.1'

2014-02-12 11:13:29 +13:00

CMSSiteTreeFilter.php

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

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

ContentController.php

FIX: Fix failover to index template in ContentController::getViewer()

2014-02-14 17:44:53 +13:00

LeftAndMainPageIconsExtension.php

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

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

ModelAsController.php

Numerous PHPDoc fixes.

2014-02-10 15:35:13 -05:00

NestedController.php

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

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

OldPageRedirector.php

Merge branch '3.1'

2014-02-12 11:13:29 +13:00

RootURLController.php

Numerous PHPDoc fixes.

2014-02-10 15:35:13 -05:00

SilverStripeNavigator.php

Numerous PHPDoc fixes.

2014-02-10 15:35:13 -05:00