Damian Mooyman d01883a5f8 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml
	code/model/SiteConfig.php

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

..

AssetAdmin.php

Merge remote-tracking branch 'origin/3.1' into merge-back

2014-08-13 17:19:01 +12:00

CMSFileAddController.php

#1067 No updateEditForm hook on CMSFieldAddController::getEditForm()

2014-08-01 10:37:11 +12:00

CMSMain.php

Merge remote-tracking branch 'origin/3.1' into merge-back

2014-08-13 17:19:01 +12: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

API: Extract siteconfig out to an external module.

2014-08-09 17:29:50 +12:00

CMSSiteTreeFilter.php

Fix changed pages filter to match SiteTree's 'MODIFIED' label

2014-08-07 16:48:06 +12:00

ContentController.php

Merge remote-tracking branch 'origin/3.1' into merge-back

2014-08-13 17:19:01 +12: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

API Move of codebase to parameterised query database abstraction layer

2014-07-07 15:07:37 +12:00

NestedController.php

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

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

OldPageRedirector.php

API Move of codebase to parameterised query database abstraction layer

2014-07-07 15:07:37 +12:00

RootURLController.php

API Move of codebase to parameterised query database abstraction layer

2014-07-07 15:07:37 +12:00

SilverStripeNavigator.php

Merge remote-tracking branch 'origin/3.1'

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