* 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
* develop-olympus:
[ticket/12247] Makes static usernames work
[ticket/12247] Add ['username'] to mcp_queue.php's user_notification()
Conflicts:
phpBB/includes/mcp/mcp_queue.php
* develop-olympus:
[ticket/12202] Use an array in the data provider instead of exploding manually
[ticket/12202] Can't call htmlspecialchars before checking for quotes
[ticket/12202] Fix tests
[ticket/12202] Test for parse_cfg_file
[ticket/12202] Use copyright symbol in style.cfg files
[ticket/12202] Apply htmlspecialchars to style.cfg data
Conflicts:
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
* exreaction/ticket/12202:
[ticket/12202] Use an array in the data provider instead of exploding manually
[ticket/12202] Can't call htmlspecialchars before checking for quotes
[ticket/12202] Fix tests
[ticket/12202] Test for parse_cfg_file
[ticket/12202] Use copyright symbol in style.cfg files
[ticket/12202] Apply htmlspecialchars to style.cfg data
* dhruv/ticket/11040:
[ticket/11040] Topic is deleted if test is skipped
[ticket/11040] Use unique text for the test post added
[ticket/11040] Use hard delete in delete_topic
[ticket/11040] Add migration to drop postgres search indexes
[ticket/11040] Delete the functional test topic to avoid conflicts
[ticket/11040] Add methods to delete post and topic in functional tests
[ticket/11040] Swap post_text and post_subject for post_content index
[ticket/11040] Add test cases for searching subject and post content together
[ticket/11040] Remove postgres extra indexes
[ticket/11040] Add post_content index
[ticket/11040] Search subject and text together
Relative to the last ticket, this allows static usernames to
work correctly (those inserted in the post-column post_username)
when sending the e-mail, instead of showing just "Anonymous".
PHPBB3-12247
It includes the poster's username in the email notifications of
posts that get approved by moderators.
This is done by adding the username to every user_notification()
function located in /phpBB/includes/mcp/mcp_queue.php.
PHPBB3-12247
The resize element displays a mechanism for allowing the
user to resize the element. Setting this to vertical means it
may only be resized vertically.
PHPBB3-11111
* crizz0/ticket/8785:
[ticket/8785] Deletes additional add and add_bcc buttons
[ticket/8785] Fixed problem with add empty.png and travis will now pass
[ticket/8785] and again a fresh line
[ticket/8785] Just one blank line
[ticket/8785] pm_layout.html back to more standard code
[ticket/8785] <hr /> will only displayed when needed
[ticket/8785] Adds blank lines at file end
[ticket/8785] Adds a new optical improvement, new file and fixes html bugs
[ticket/8785] Adds two <hr /> to seperate recipients and BCC
[ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
[ticket/8785] Little spaces mistake
[ticket/8785] Rebuilding posting_editor pm head + new language vars
[ticket/8041] Merge item name into "Return to" string for better translations
* nickvergessen/ticket/8041:
[ticket/8041] Add space/tabs after => in array list
[ticket/8041] Wrap forum name, topic title and pm folder name with quotes
[ticket/8041] Merge item name into "Return to" string for better translations