Ingo Schommer 0a1ffd3e1a Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml

2013-10-20 13:51:19 +02:00

..

AssetAdmin.php

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

2013-09-12 17:16:29 +02:00

CMSFileAddController.php

Correct form name in CMSFileAddController, fixes upload

2013-07-02 09:33:38 +02:00

CMSMain.php

Add an extension hook for customising site tree hints.

2013-10-11 01:31:07 +11:00

CMSPageAddController.php

Search callback for "add page" selector

2013-08-29 17:08:42 +02:00

CMSPageEditController.php

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

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

CMSPageHistoryController.php

Using new CMSForm class to allow for validation errors in CMS

2013-06-13 07:44:37 +02: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

SiteConfig updated to modeladmin style and fixed ajax switching

2013-08-24 12:33:38 +02:00

CMSSiteTreeFilter.php

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

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

ContentController.php

BUG Fixed instances of loosely defined SQL predicates not qualified by table name

2013-08-29 13:59:45 +12:00

LeftAndMainPageIconsExtension.php

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

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

ModelAsController.php

BUG Fixed instances of loosely defined SQL predicates not qualified by table name

2013-08-29 13:59:45 +12:00

NestedController.php

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

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

RootURLController.php

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

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

SilverStripeNavigator.php

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

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