* vsephpbb/ticket/12060: (37 commits)
[ticket/12060] A little less verbose cleanup of event docblocks
[ticket/12060] Further clarifying new event docblocks as much as possible
[ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
[ticket/12060] Remove whitespaces
[ticket/12060] Fix docblock for acp_bbcodes_modify_create event
[ticket/12060] Rename event in message parser to modify_format_display_text_after
[ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
[ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
[ticket/12060] Use separate template event for acp user signature posting buttons
[ticket/12060] Rename event from append to after in acp_bbcodes.html
[ticket/12060] Correctly label alpha versions in event docblocks
[ticket/12060] Fix u_action comments in docblocks
[ticket/12060] Change @since in event docblocks
[ticket/12060] Update the docblock comments in acp core events
[ticket/12060] Refactor u_action in the events that use it
[ticket/12060] Use $sql_ary instead of $sql
[ticket/12060] Update docblock for core event due to addition of another var
[ticket/12060] Remove re-tabbing of html from subsilver2 files
[ticket/12060] Add $update_this_message var to the core event
[ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
...
* 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.