Ingo Schommer 99ba7bdb4e Merge remote-tracking branch 'origin/3.0' into 3.1 ...

Conflicts:
	lang/en.yml
	templates/CMSPageHistoryController_versions.ss

2013-08-07 17:15:17 +02:00

..

AssetAdmin.php

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

2013-08-07 17:15:17 +02:00

CMSFileAddController.php

Correct form name in CMSFileAddController, fixes upload

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

CMSMain.php

Translations: Switch to Transifex format

2013-08-04 12:31:29 +02:00

CMSPageAddController.php

Using new CMSForm class to allow for validation errors in CMS

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

Using new CMSForm class to allow for validation errors in CMS

2013-06-13 07:44:37 +02:00

CMSSiteTreeFilter.php

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

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

ContentController.php

Merge branch '3.0' into 3.1

2013-07-14 17:24:06 +12:00

ModelAsController.php

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

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

NestedController.php

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

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

ReportAdmin.php

Using new CMSForm class to allow for validation errors in CMS

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