Fix for joins code block
DOCS Setting allowed_extensions in YAML

3.1 compatible docs in place of #3267
Merge pull request #3308 from camfindlay/patch-9

DOCS Setting allowed_extensions in YAML
API Let extensions control folder selector in HtmlEditorField_Toolbar
Merge pull request #3312 from tractorcow/pulls/3.1/extend-htmleditor-parentid

API Let extensions control folder selector in HtmlEditorField_Toolbar
Merge pull request #3277 from kopymark/patch-3

Fix for joins code block
Moved checkboxset  option list generation to separate method

This allows subclasses and extensions time to modify the list of options and their configuration without having to override the entire Field method.

A more flexible way to implement silverstripe#3311
Merge pull request #3319 from wilr/movetogetoptions

Moved option list generation to separate method
BUG: CMS tree filters doesn't count the correct number of children for deleted pages

This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.

This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.

The solution involves a couple of smaller fixes in both CMS and framework modules.

1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter