Ingo Schommer 25b6175e67 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml
	forms/FormField.php

2013-10-20 13:52:56 +02:00

..

AdminRootController.php

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

2013-03-24 17:20:53 +01:00

CMSBatchAction.php

BUGFIX: Removed regression introduced in 9741d1. With the former in place, CMS authors can no longer perform batch publish actions

2013-05-30 16:05:56 +12:00

CMSBatchActionHandler.php

Fix CMSBatchActionHandler::$allowed_actions

2013-06-28 10:07:57 +02:00

CMSForm.php

Allow non-action buttons to pass through validation (fixes #2527)

2013-10-16 10:39:31 +01:00

CMSMenu.php

API: Add attributes argument for CMSMenuItem.

2013-10-02 19:06:54 +13:00

CMSMenuItem.php

API: Add attributes argument for CMSMenuItem.

2013-10-02 19:06:54 +13:00

CMSPreviewable.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

CMSProfileController.php

API Enforce $allowed_actions in RequestHandler->checkAccessAction()

2013-06-24 14:50:40 +02:00

GroupImportForm.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

LeftAndMain.php

Globalization in TreeDropdownField JS

2013-10-08 12:12:25 +02:00

LeftAndMainExtension.php

Update @package, @subpackage labels

2013-05-21 22:24:41 +12:00

MemberImportForm.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

ModelAdmin.php

Merge remote-tracking branch 'origin/3.1'

2013-08-07 17:34:11 +02:00

SecurityAdmin.php

Merge pull request #2453 from chillu/pulls/escape-3.1.0

2013-09-25 16:02:45 -07:00