Merge branch 'prep-release-3.0.12' into develop-olympus

* prep-release-3.0.12:
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
Merge pull request #1549 from cyberalien/ticket/10999

[ticket/10999] Fix assets_version in ACP
Merge pull request #1543 from nickvergessen/ticket/11685

[ticket/11685] Remove logout confirmation page
Merge pull request #1541 from nickvergessen/ticket/11684

[ticket/11684] Remove useless confirmation page after login and admin login
Merge pull request #1436 from cyberalien/ticket/11563

Fix subPanels() in forum_fn.js
Merge branch 'develop' into ticket/11215

* develop: (214 commits)
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  [ticket/9657] Remove old code
  [ticket/9657] Keep approval state of posts/topics when copying them
  [ticket/9657] Add functional tests for forking a copy
  [ticket/9657] Add functional test for splitting topic
  [ticket/11112] Do not change opensource.org link to https
  [ticket/9657] Add functional test for restoring a post/topic
  [ticket/11112] Use https for user-visible links to phpbb.com
  [ticket/9657] Fix a little error when moving softdeleted topics
  [ticket/9657] Add unit tests for softdeleting and moving posts/topics
  [ticket/9657] Remove last references to m_restore permission
  [ticket/9657] Fix english language :(
  [ticket/9657] Notifications do not require emails or jabber anymore
  ...
[ticket/9649] Display information on index for moderators on unapproved posts

PHPBB3-9649
Merge pull request #1550 from nickvergessen/ticket/9649

[ticket/9649] Display information on index for moderators on unapproved posts
Merge remote-tracking branch 'phpbb-core/develop'

* phpbb-core/develop: (1153 commits)
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  [ticket/9657] Remove old code
  [ticket/11671] Update composer.lock
  [ticket/11671] Update composer.lock
  [ticket/9657] Keep approval state of posts/topics when copying them
  [ticket/9657] Add functional tests for forking a copy
  [ticket/9657] Add functional test for splitting topic
  [ticket/11112] Do not change opensource.org link to https
  [ticket/9657] Add functional test for restoring a post/topic
  [ticket/11671] Add phing as a dependency and upgrade deps
  [ticket/11112] Use https for user-visible links to phpbb.com
  [ticket/11668] Move lint test to the end for travis
  ...
Merge pull request #1473 from marc1706/ticket/11600

[ticket/11600] Increase code test coverage of avatar manager
[ticket/11690] Old module class names may get autoloaded by class_exists

PHPBB3-11690
Merge remote-tracking branch 'github-exreaction/ticket/11686' into develop-olympus

* github-exreaction/ticket/11686:
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
Merge pull request #1553 from naderman/ticket/11690

[ticket/11690] Old module class names may get autoloaded by class_exists
Merge pull request #1429 from cyberalien/ticket/11553

Move bulletin points for linklist lists to pseudo classes
[ticket/11675] Fix template loop

PHPBB3-11675
Merge pull request #1554 from EXreaction/ticket/11675

[ticket/11675] Fix template loop
[ticket/11692] Don't update search_type in dev migration if already appended

PHPBB3-11692
Merge branch 'develop' into ticket/11215

* develop:
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11553] Typo
  [ticket/11553] Replace bullet with unicode
  [ticket/11553] Move bulletin points to pseudo class
  [ticket/11600] Remove duplicate test case
  [ticket/11600] Use lowercase null and remove duplicate test cases
  [ticket/11600] Use local variable for $user in test_localize_errors
  [ŧicket/11600] Split get driver tests into tests for all and only enabled ones
  [ticket/11600] Increase code test coverage of avatar manager