* develop-olympus:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
* prep-release-3.0.11:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
* develop: (441 commits)
[feature/new-tz-handling] Don't use global user but make it a parameter
[feature/new-tz-handling] Fix size of suggestion button in chrome
[feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
[feature/new-tz-handling] Add previous selected value to validation if valid
[feature/new-tz-handling] Display suggestion when a different value is selected
[ticket/10998] Add border-radius to forum rules block - prosilver
[feature/new-tz-handling] Remove additional marking of selected items
[feature/new-tz-handling] Move update helper function to new class
[feature/new-tz-handling] Fix unit test
[feature/new-tz-handling] Delete old variable which is not used anymore
[feature/new-tz-handling] Rename $user->tz back to $user->timezone
[feature/pagination-as-list] New parameter for name of start var
[feature/pagination-as-list] Updates for nils comments
[feature/pagination-as-list] Rename and deprecate functions
[feature/pagination-as-list] Various fixes and improvements
[ticket/10968] Render pagination within the template
[feature/new-tz-handling] Remove "timezone might be numeric"
[feature/new-tz-handling] Add function to update the timezone
[feature/new-tz-handling] Correctly update user and board timezones on update
[ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
...
Conflicts:
phpBB/common.php
phpBB/composer.json
phpBB/composer.lock
tests/cron/task_provider_test.php
* github-nickvergessen/ticket/10950:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
Don't generate sphinx config file if database is not supported. Add
property $dbtype to write into sphinx config file according to sql_layer.
PHPBB3-10946
Instead of REPLACE use UPDATE since pgsql does not support REPLACE.
A row is inserted at time of creating table so REPLACE is no longer
needed.
PHPBB3-10946
Sphinx config class is modified to return the configuration data instead
of writing it to a file. Search backend property config_file_data stores
the generated data.
PHPBB3-10946
* Fyorl/ticket/10992:
[ticket/10992] Changed octetstream to octet-stream
[ticket/10992] test_empty_file() now tries to upload the correct file
[ticket/10992] Modified upload tests to work with new version
