* vsephpbb/ticket/12014:
[ticket/12014] Change event date in docs
[ticket/12014] Fix version number in event docs
[ticket/12014] Template Event index_body.html before forumlist
Add the overall_header_navigation_append / prepend template events
used in Prosilver to subsilver2 as well. This will allow extensions to
add Nav Links to Subsilver2.
http://tracker.phpbb.com/browse/PHPBB3-11966
PHPBB3-11966
* develop-olympus:
[ticket/11951] Add MariaDB to platforms we test on.
[ticket/11951] Add MariaDB to supported DBMSes in requirement section.
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
* develop-olympus:
[prep-release-3.0.12] Update changelog for 3.0.12 release.
[ticket/11873] Add unit test for large password input.
[ticket/11873] Do not hash very large passwords in order to safe resources.
* prep-release-3.0.12:
[prep-release-3.0.12] Update changelog for 3.0.12 release.
[ticket/11873] Add unit test for large password input.
[ticket/11873] Do not hash very large passwords in order to safe resources.
* develop-olympus:
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
Conflicts:
build/build.xml
phpBB/install/database_update.php
* prep-release-3.0.12:
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
Even though the coding guidelines document prescribes "commas after every
array element", it contains several example code fragments with array elements
not terminated by a comma. This commit fixes that.
PHPBB3-11794
Per suggestion of nickvergessen, stick to "before" and "after" in the template
event descriptions instead of "at the top of" and "at the bottom of".
PHPBB3-9550
* develop-olympus:
[prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC2.
Conflicts:
build/build.xml
phpBB/install/database_update.php