* develop-ascraeus:
[ticket/12419] Also shrink the size of "See All" in footer a little bit
[ticket/12419] Improve font size in notifications drop-down
* VSEphpbb/ticket/12419:
[ticket/12419] Also shrink the size of "See All" in footer a little bit
[ticket/12419] Improve font size in notifications drop-down
[ticket/12121] Preserve link redirect counts when updating from 3.0.x.
* prototech/ticket/12121:
[ticket/12121] Preserve link redirect counts when updating from 3.0.x.
[ticket/12417] Revert "No longer allow Travis CI HHVM environment to fai...
* bantu/ticket/12417:
[ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
hhvm-nightly 2014.04.16~precise introduced "Attempted to serialize
unserializable builtin class DOMElement" errors when running functional tests.
This reverts commit ff7cc77f9d.
PHPBB3-12417
[ticket/12191] Move notification options to bottom while installing
* n-aleha/ticket/12191:
[ticket/12191] Move notification options to bottom while installing
[ticket/12401] Add $topic_data array to core.viewtopic_modify_post_row event
* rxu/ticket/12401:
[ticket/12401] Pass more data to core.viewtopic_modify_post_row event
* develop-ascraeus:
[ticket/10423] Replace foreach with function in viewtopic.php
[ticket/10423] Remove unnecessary include in test
[ticket/10423] Match multiple wildcards
[ticket/10423] Move code into a function and add tests for it
[ticket/10423] Remove * from search or highlight string
* develop-olympus:
[ticket/10423] Replace foreach with function in viewtopic.php
[ticket/10423] Remove unnecessary include in test
[ticket/10423] Match multiple wildcards
[ticket/10423] Move code into a function and add tests for it
[ticket/10423] Remove * from search or highlight string
[ticket/10423] Remove * from search or highlight string
* Elsensee/ticket/10423:
[ticket/10423] Replace foreach with function in viewtopic.php
[ticket/10423] Remove unnecessary include in test
[ticket/10423] Match multiple wildcards
[ticket/10423] Move code into a function and add tests for it
[ticket/10423] Remove * from search or highlight string
* develop-ascraeus:
[ticket/12388] Add tests for lang() use on log actions without data
[ticket/12388] Fix translation of log entries without additional log data
[ticket/12388] Fix translation of log entries without additional log data
* nickvergessen/ticket/12388:
[ticket/12388] Add tests for lang() use on log actions without data
[ticket/12388] Fix translation of log entries without additional log data
* develop-ascraeus:
[ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
[ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
[ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
[ticket/12372] Move dE() function core.js
[ticket/12372] Unify definition of function dE() across all files
[ticket/12372] Use jQuery in javascript dE() function
* marc/ticket/12372:
[ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
[ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
[ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
[ticket/12372] Move dE() function core.js
[ticket/12372] Unify definition of function dE() across all files
[ticket/12372] Use jQuery in javascript dE() function
Multiple wildcards are removed from the string if there is
no word before or after them. If there is a word before or
after them, they are just replaced with a single one.
PHPBB3-10423
