* develop-olympus:
[ticket/10767] Clarify what happens at the end of the hook.
[ticket/10767] Use warning/error language as appropriate.
[ticket/10767] Default to non-fatal behavior.
[ticket/10767] Revert unconditional unfatality in commit-msg hook.
* p/ticket/10767:
[ticket/10767] Clarify what happens at the end of the hook.
[ticket/10767] Use warning/error language as appropriate.
[ticket/10767] Default to non-fatal behavior.
[ticket/10767] Revert unconditional unfatality in commit-msg hook.
* shibulijack/ticket/10688:
[ticket/10688] Update install.html for 3.1 and current practices.
[ticket/10688] Update readme for 3.1 and current practices.
[ticket/10688] Changed version 3.0 to 3.1
[ticket/10688] Updated version to 3.1
[ticket/10688] Changed 3.0 to 3.1 in docs
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
* develop-olympus:
[ticket/9089] Add tabindex to pm/topic/post icon-options aswell
[ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
* nickvergessen/ticket/9089:
[ticket/9089] Add tabindex to pm/topic/post icon-options aswell
[ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
Installer now checks json extension and cannot continue without it.
Changes are made in phpBB/install/install_install.php where the
checking for json is added and to phpBB/language/en/install.php where
2 new keys for the messages that would be displayed are also added.
PHPBB3-10813
* naderman/ticket/10759:
[ticket/10759] Make sure style ids are integers
[ticket/10759] Don't select imageset_id, it's not needed
[ticket/10759] Clarify comments a bit
[ticket/10759] Retrieve style_id after INSERT since we cannot set it
[ticket/10759] Fix whitespace in database_update.php
[ticket/10759] Fixing style in database updater
If there are problems and fatal is true, print that the commit
is aborted.
If there are problems and fatal is false, print instructions
for fixing the commit.
PHPBB3-10767
When commit-msg hook is fatal, label the message as an error.
When it is not fatal, label the message as a warning.
"Syntax error" is still always an error, not sure if this
should be changed.
PHPBB3-10767
Used transparent background for unchanged lines
Shortened the table headers and make the background grey
Added a border between the columns
Increased the font size on pre blocks
Added Consolas as the first pre font, for Windows users
Added wordwrapping for pre blocks
PHPBB3-10819
* github-callumacrae/ticket/10783:
[ticket/10783] Added assets_version to ACP and simple_*.html.
[ticket/10783] Added assets_version to subsilver2.
[ticket/10783] Added ?assets_version to assets.
* develop-olympus:
[ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
[ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
* bantu/ticket/10788:
[ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
[ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
