Ingo Schommer 3214a0a756 Merge remote-tracking branch 'origin/3.0' ...

Conflicts:
	admin/css/screen.css

2012-11-06 19:56:34 +01:00

..

AdminRootController.php

FIX Remove instances of lines longer than 120c

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

CMSBatchAction.php

Method visibility according to coding conventions

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

CMSBatchActionHandler.php

FIX Remove instances of lines longer than 120c

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

CMSMenu.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13: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

Fixed merge errors in CMSProfileController

2012-10-30 18:03:49 +01:00

GroupImportForm.php

FIX Remove instances of lines longer than 120c

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

LeftAndMain.php

Merge branch '3.0'

2012-11-06 13:04:21 +13:00

LeftAndMainDecorator.php

Scoped deprecation messages (fixes #7645)

2012-07-13 11:37:35 +02:00

LeftAndMainExtension.php

Method visibility according to coding conventions

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

MemberImportForm.php

FIX Remove instances of lines longer than 120c

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

ModelAdmin.php

FIX Remove instances of lines longer than 120c

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

SecurityAdmin.php

Upgrade jQuery UI to 1.9

2012-11-06 19:45:56 +01:00