* feature/bantu/remote_upload-filesize:
[feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer.
[feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded.
* ticket/cs278/9582:
[ticket/9582] MSSQL native backups can now be restored.
[ticket/9582] Advanced search cannot be accessed using MSSQL native.
[ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native.
[ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver.
[ticket/9582] Custom profile fields cannot be created under MSSQL native.
* ticket/cs278/9520:
[ticket/9520] Additionally filter requests for {common,config}.php
[ticket/9520] New web.config file as suggested by Microsoft using request filter
[ticket/9520] Removed per directory web.config files.
[ticket/9520] Add suggested web.config for root files as suggested by Microsoft.
[ticket/9520] Add some default web.config files for IIS.
* feature/cs278/git-tools:
[git-tools] Use @ instead of : in sed command in pre-commit hook for wider compatibility.
[git-tools] Adjusted pre-commit hook to run under freebsd /bin/sh.
[git-tools] Changed pre-commit hook to use sh instead of bash
* feature/cs278/webpi:
[feature/webpi] Web PI supports UNIX line endings so we'll remove them
[feature/webpi] Hopefully finally fix this
[feature/webpi] Fix messed up line endings
[feature/webpi] Add WebPI support to the build script.
[feature/webpi] Package files for Microsoft Web Platform Installer
[feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
[feature/dbal-tests] Fix mysql (not mysqli) dbal test.
* feature/nickvergessen/unapproved-posts-in-feed:
[feature/unapproved-posts-in-feed] Little changelog correction
[feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
[feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed
Conflicts:
phpBB/docs/CHANGELOG.html
* bug/nickvergessen/9512:
[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)
Conflicts:
phpBB/docs/CHANGELOG.html
* bug/nickvergessen/58695:
[bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
[bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
Conflicts:
phpBB/docs/CHANGELOG.html
* feature/evil3/git-tools:
[git-tools] add note about PHP_BIN using env
[git-tools] do not display stderr
[git-tools] Prepend the branch to the commit message for all branches.
[git-tools] Use env to find the correct paths to binaries.
[git-tools] Display what parse errors were found.
[git-tools] This script requires bash to run, so point directly to bash.
[git-tools] Improvements for the pre-commit hook
[git-tools] Improvements on prepare-commt-msg hook
[git-tools] Some pre-commit enhancements, abolish tempfile
[git-tools] use mktemp in pre-commit (thanks nn-)
[git-tools] pre-commit hook for syntax checking
