* develop-olympus:
[ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
[ticket/12318] Pin HHVM version to 3.0.0~precise.
[ticket/12318] Always install new config file on HHVM upgrade conflict.
[ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
[ticket/12318] Upgrade to a recent stable version of HHVM.
[ticket/12318] Correctly setup HHVM for functional tests.
* bantu/ticket/12318-olympus:
[ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
[ticket/12318] Pin HHVM version to 3.0.0~precise.
[ticket/12318] Always install new config file on HHVM upgrade conflict.
[ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
[ticket/12318] Upgrade to a recent stable version of HHVM.
[ticket/12318] Correctly setup HHVM for functional tests.
* crizz0/ticket/9758:
[ticket/9758] Clickable avatar in header and renamed class for avatar-img
[ticket/9758] Remove unnessary if-question for include functions_display
[ticket/9758] Slims the line 4775 in includes/functions.php
[ticket/9758] Adds id and changes filter to fix travis CI test
[ticket/9758] Removed the needless space after first ENDIF
[ticket/9758] Adding impr. for overall_header display of avatar and username
[ticket/9758] Fixed bug in mcp_warn.php
[ticket/9758] Optimises the html code of avatar image in header
[ticket/9758] Error because of missing functions_display.php fixed
[ticket/9758] Removed useless if-conditions to include functions.php
[ticket/9758] Changes class name of new "span" in overall_header.html
[ticket/9758] Adds global template variable CURRENT_USER_AVATAR
* prep-release-3.1.0-b2:
[prep-release-3.1.0-b2] Prepare development of 3.1.0-b3
[prep-release-3.1.0-b2] Add changelog for 3.1.0-b2
[prep-release-3.1.0-b2] Prepare Changelog
[prep-release-3.1.0-b2] Add migration for 3.1.0-b2
[prep-release-3.1.0-b2] Update version to 3.1.0-b2
* nickvergessen/ticket/12326:
[ticket/12326] Correctly format update/index.php and remove php closing tag
[ticket/12326] Do not add deleted files to the list of changed files
[ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png
* n-aleha/ticket/12321:
[ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png
* github-nickvergessen/ticket/11459: (21 commits)
[ticket/11459] Make 3.1.0-dev migration depend on migrations_table
[ticket/11459] Move $supported_dbms to beginning of create schema file
[ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index()
[ticket/11459] Fix auth provider test
[ticket/11459] Correctly set up the database from schema in unit tests
[ticket/11459] Install DB schema from json file
[ticket/11459] Clean up a little more
[ticket/11459] Do not add table schema to database schema files
[ticket/11459] Create schema.json from migration files
[ticket/11459] Do not take files of extensions into account
[ticket/11459] Pass array with migration class names to schema generator
[ticket/11459] Refresh schema files
[ticket/11459] Remove spaces from the end of lines in MSSQL
[ticket/11459] Correctly handle index column length
[ticket/11459] Add migration for migrations table
[ticket/11459] Update doc blocks
[ticket/11459] Remove old schema file
[ticket/11459] Update schema files with new script
[ticket/11459] Use new migration/schema_generator to create schema files
[ticket/11459] Add Schema from 3.0.0
...
* prototech/ticket/11959:
[ticket/11959] Move phpbb_generate_string_list() to functions_content.php.
[ticket/11959] Add unit tests.
[ticket/11959] Remove use of plurals and make it possible to use Oxford comma.
[ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
[ticket/11959] Simplify how the users are trimmed.
[ticket/11959] Add function to create a string list.
[ticket/11959] Add samples for the untrimmed strings.
[ticket/11959] List the last user with "and" instead of a comma.
[ticket/11959] Use the plurals system for the untrimmed language strings.
[ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.
[ticket/11959] Use plurals for the language strings.
When a forum has a forum-rules link instead of forum-rules text, there
is no way to distinguish in the styling of the container (or the button)
it will have.
It should be possible to style the <div class="rules"> container
differently if there is only a link (no text).
PHPBB3-12304
