* develop-ascraeus:
[ticket/12012] Move property to the top
[ticket/12012] Move MS SQL server comparison into a method
[ticket/12012] Fix docs in connection manager
[ticket/12012] Remove duplicated code (only the $sql are different)
[ticket/12012] Handle begin and commit transactions in tests
[ticket/12012] Drop and recreate indexes when removing columns
[ticket/12012] Add a unit test for removing a column with indexes
[ticket/12012] Add a unit test for changing the column type
[ticket/12012] Return SQL statements for index drop/create
[ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
[ticket/12012] Drop and recreate indexes when changing a column on MSSQL
[ticket/12012] Fix query layout
[ticket/12012] Correctly drop default value constraints on MSSQL
[ticket/12012] Correctly drop default value constraints
* nickvergessen/ticket/12012:
[ticket/12012] Move property to the top
[ticket/12012] Move MS SQL server comparison into a method
[ticket/12012] Fix docs in connection manager
[ticket/12012] Remove duplicated code (only the $sql are different)
[ticket/12012] Handle begin and commit transactions in tests
[ticket/12012] Drop and recreate indexes when removing columns
[ticket/12012] Add a unit test for removing a column with indexes
[ticket/12012] Add a unit test for changing the column type
[ticket/12012] Return SQL statements for index drop/create
[ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
[ticket/12012] Drop and recreate indexes when changing a column on MSSQL
[ticket/12012] Fix query layout
[ticket/12012] Correctly drop default value constraints on MSSQL
* develop-ascraeus:
[ticket/12382] Mark broken nested loop with include as incomplete
[ticket/12382] Add template test for subloops inside includes
[ticket/12382] Add template test for subloops inside events
* nickvergessen/ticket/12382:
[ticket/12382] Mark broken nested loop with include as incomplete
[ticket/12382] Add template test for subloops inside includes
[ticket/12382] Add template test for subloops inside events
Only add notifications, if we are not reapproving post
When the topic was already approved, but was edited and
now needs re-approval, we don't want to notify the users again.
PHPBB3-11772
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.
* develop-ascraeus:
[ticket/11917] Move OAuth Module to the bottom while installing
[ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
* 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
* develop-ascraeus:
[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/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.
