We run into the risc that the data is longer then the character limit
of the table column. However as we trim the users list anyway, we can
also just stop adding them and display "many others" instead of "x others"
PHPBB3-12371
When a post is marked edited and therefor marked as softdeleted/unapproved,
we should not delete the notifications, just like we can't delete the emails.
Links are out there anyway and just keeping the notification is fail save.
If we keep the notification we can just continue to update it when more posts
are added. Also when we delete a post, we don't have to go though the table
and find all related notifications to be able to delete them or even update
them, when they have responders set.
PHPBB3-12371
[ticket/12436] Data passed to sql_multi_insert is expected to be multi-d...
* bantu/ticket/12436:
[ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
* github-nickvergessen/ticket/11917:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
Conflicts:
phpBB/install/install_install.php
[ticket/12201] Clean up ACP attachment management page
* prototech/ticket/12201:
[ticket/12201] Decreased pagination font size.
[ticket/12201] Update select element to follow same design as prosilver.
[ticket/12201] Increase sort font size just slightly.
[ticket/12201] Add link to resync file stats after error.
[ticket/12201] Fix typos in language pack.
[ticket/12201] Display error and sorting options when there are no attachments
[ticket/12201] Only the top pagination should be floated to the right.
[ticket/12201] Rearrange pagination, sorting, and submit elements.
[ticket/12201] Center the file size and mark columns.
[ticket/12201] Separate pagination from table.
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
* prototech/ticket/12130:
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
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
