Hamish Friedlander 0a79ac3592 Merge branch 'origin/3.1' ... Conflicts: templates/forms/CheckboxSetField.ss templates/forms/FormField_holder.ss templates/forms/OptionsetField.ss		2013-07-19 16:25:38 +12: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	API New CMSForm class to allow validation responses in CMS (fixes #1777)	2013-06-13 07:51:05 +02:00
CMSMenu.php	CMSMenu sort order (fixes #1716)	2013-04-09 12:19:33 +02:00
CMSMenuItem.php	Clean up trailing ?> per coding standard	2012-02-12 12:40:16 -08: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	BUG Prevent clickjacking in CMS and Security controllers (fixes #2215)	2013-07-14 22:44:09 +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-06-19 11:17:33 +02:00
SecurityAdmin.php	API New CMSForm class to allow validation responses in CMS (fixes #1777)	2013-06-13 07:51:05 +02:00