Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php

2014-08-14 09:08:26 +12:00

..

AdminRootController.php

Update docblocks

2013-10-15 11:29:58 +13:00

CMSBatchAction.php

API New Database abstraction layer. Ticket #7429

2014-07-09 18:04:05 +12:00

CMSBatchActionHandler.php

API New Database abstraction layer. Ticket #7429

2014-07-09 18:04:05 +12:00

CMSForm.php

BUG Issues with CMSForm not consistently respecting new form naming scheme.

2013-10-30 17:08:31 +13:00

CMSMenu.php

Correct line length and indentation

2014-03-30 21:11:56 +13:00

CMSMenuItem.php

API: Add attributes argument for CMSMenuItem.

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

CMSPreviewable.php

Update docblocks

2013-10-15 11:29:58 +13:00

CMSProfileController.php

admin/myprofile layout after validation (fixes #2644)

2013-11-07 16:19:40 +01:00

GroupImportForm.php

Update docblocks

2013-10-15 11:29:58 +13:00

LeftAndMain.php

Merge remote-tracking branch 'origin/3.1'

2014-08-14 09:08:26 +12:00

LeftAndMainExtension.php

Update docblocks

2013-10-15 11:29:58 +13:00

MemberImportForm.php

Update docblocks

2013-10-15 11:29:58 +13:00

ModelAdmin.php

Merge remote-tracking branch 'origin/3.1'

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

SecurityAdmin.php

FIX: Use Injector API for managing Member_Validator instance.

2013-10-16 11:29:43 +13:00