* marc/ticket/12372:
[ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
[ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
[ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
[ticket/12372] Move dE() function core.js
[ticket/12372] Unify definition of function dE() across all files
[ticket/12372] Use jQuery in javascript dE() function
When you click on the link, the turning circle is missing, so you don't
know whether it is actually doing something or not, until the response is
served.
PHPBB3-12351
All columns were renamed from having prune_shadow_topics as namebase to just
prune_shadow.
A missing column was also added to the migration file's remove_schema() method.
PHPBB3-12150
* develop-olympus:
[ticket/12035] Correcting the condition
[ticket/12035] Adding necessary conditions
[ticket/12035] Adding link to user posts to ACP page
Conflicts:
phpBB/adm/style/acp_users_overview.html
http://tracker.phpbb.com/browse/PHPBB3-12292
Gave style details page a proper heading and back button.
Also removed a few obsolete code leftovers in the style
and CSS.
PHPBB3-12292
* EXreaction/ticket/9871-2:
[ticket/9871] Can set current version to use instead of the phpBB version
[ticket/9871] Fix indentation on comment
[ticket/9871] Fix test name
[ticket/9871] Split fast and slow version tests
[ticket/9871] Option to force the stability when checking for updates
[ticket/9871] Allow setting the host/file to load for the version class
[ticket/9871] Restore get_remote_file_test
[ticket/9871] Fix tests
[ticket/9871] Typehint and comment on var types
[ticket/9871] Mark test as slow
[ticket/9871] Restore phpbb_version_compare
[ticket/9871] Restore get_remote_file
[ticket/9871] Use $request->variable instead of request_var
[ticket/9871] Update version check file to use json format
* github-nickvergessen/ticket/12235:
[ticket/12235] Convert WLM to custom profile field
[ticket/12187] Do not make clickable when using as contact field
[ticket/12187] Split generate_profile_fields_template() into 2 methods
[ticket/12187] Remove user_website field
[ticket/12187] Remove user_website functionality
[ticket/12187] Convert website field data to custom profile field
[ticket/12187] Add URL type for profile fields
[ticket/12234] Replace ICQ with custom profile field
[ticket/12233] Update schema file
[ticket/12233] Add images back to subsilver2
[ticket/12233] Allow profile fields to be contact fields
Conflicts:
phpBB/adm/style/acp_prune_users.html