Merge branch 'harderthanfire/ticket/10129' into develop-olympus
Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into develop-olympus
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus

To keep the .gitignore's the same.

PHPBB3-9550
Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympus

Feature/events dispatcher olympus
[Ticket/10675] Correct language string ATTACH_DISK_FULL

Add period to ATTACH_DISK_FULL language string

PHPBB3-10675
Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus

* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
[ticket/10731] Fixed addquote() to work on opera browser.

In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
[ticket/10699] Long h2 title breaks div.minitabs in MCP

Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both

PHPBB3-10699
[ticket/10699] Long h2 title breaks div.minitabs in MCP

Fixed minor issues in formatting.

PHPBB3-10699
Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympus

* sadu/ticket/10699:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
[ticket/10508] Marked as read message now less specific.

Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
Merge remote-tracking branch 'bantu/ticket/10658' into develop-olympus

* bantu/ticket/10658:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
[ticket/10760] Use externally specified PHP_BIN if any.

We have a PHP_BIN variable but we always set it unconditionally,
therefore in order to use a different php binary one had to
modify the hook script.

Instead set PHP_BIN if it is not set.

Now one can set PHP_BIN in their environment to use a non-default
php binary.

PHPBB3-10760
[ticket/10760] Use echo -e only if echo understands -e.

/bin/echo on freebsd and dash's builtin echo do not understand -e,
therefore -e is printed with the other messages in such cases.

Test if echo understands -e, if not do not use it.

PHPBB3-10760
[ticket/10760] Quote PHP_BIN when using it.

This should make a difference on windows where paths may include spaces.

PHPBB3-10760
[ticket/10760] Account for display_errors=stderr in pre-commit hook.

With that php.ini value set errors are printed to stderr, therefore
by redirecting stderr to /dev/null we also throw out the errors.

Instead merge stderr into stdout.

PHPBB3-10760
[ticket/10607] Added 'Powered by' translation string.

Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
[ticket/10760] Catch both versions of parse error output in php.

PHPBB3-10760
[ticket/10760] PHP is great. This commit is the proof.

PHPBB3-10760
[ticket/10760] Value must be quoted as it might be two words.

PHPBB3-10760