Merge branch 'ticket/12413' into ticket/12413-ascraeus
* ticket/12413:
[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
Conflicts:
phpBB/feed.php
The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.
PHPBB3-12413
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"
This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing
changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f.
PHPBB3-12413
[ticket/12193] Fix broken HTML if SQL error occurs during migration
* Elsensee/ticket/12193:
[ticket/12193] Fix broken HTML if SQL error occurs during migration
* PayBas/ticket/12347:
[ticket/12347] Remove unknown/unnecessary hack
[ticket/12347] IE8 compatible CSS selector
[ticket/12347] Changed from :after to :before
[ticket/12347] Changed to the new navbar templates
[ticket/12405] Valid timezone and dateformat for create_user() in tests
* VSEphpbb/ticket/12405:
[ticket/12405] Valid timezone and dateformat for create_user() in tests
[ticket/12390] Remove documentation, tests and other files from vendor/
* nickvergessen/ticket/12390:
[ticket/12390] Add comment to composer.json to update the build target
[ticket/12390] Move cleaning of vendor into it's own target
[ticket/12390] Remove documentation, tests and other files from vendor/
* 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 ff7cc77f9db66b7fddacd77f215d85cf0243b2fa.
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-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
[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
* 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
