* develop-ascraeus:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/memberlist_email.html
* prep-release-3.1.1:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
* commit '078e0c1e440f7f906b670348e8da00141e245876':
[ticket/13211] Move console migrator output handler back to console folder
[ticket/13211] Also use log wrapper output handler for console migrations
[ticket/13211] Move console migrator output handler to db folder
[ticket/13211] Add log wrapper for writing database updater to log file
[ticket/13126] Add missing use statement
[ticket/13126] Fix tests
[ticket/13126] Change messages verbosity levels
[ticket/13126] Move migrator_output_handler to an interface
[ticket/13126] Extends migrator_output_handler instead of using a closure
[ticket/13126] Improve the feedback when running the migrations
* develop-ascraeus:
[ticket/13211] Move console migrator output handler back to console folder
[ticket/13211] Also use log wrapper output handler for console migrations
[ticket/13211] Move console migrator output handler to db folder
[ticket/13211] Add log wrapper for writing database updater to log file
[ticket/13126] Add missing use statement
[ticket/13126] Fix tests
[ticket/13126] Change messages verbosity levels
[ticket/13126] Move migrator_output_handler to an interface
[ticket/13126] Extends migrator_output_handler instead of using a closure
[ticket/13126] Improve the feedback when running the migrations
* develop-ascraeus:
[ticket/13208] Add security issues to the final changelog
[prep-release-3.1.0] Prepare Changelog
[prep-release-3.1.0] Update version to 3.1.0
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
* develop-ascraeus:
[ticket/13137] Create schema.json in build script
[ticket/13137] Improve output of create_schema_files.php
[ticket/13137] Add schema.json file to .gitignore
[ticket/13137] Generate the schema when the schema.json file is not available
[ticket/13137] Remove schema.json file
* develop-ascraeus:
[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
[prep-release-3.1.0-RC4] Prepare Changelog
[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
[prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
* develop-ascraeus:
[ticket/12963] Always use core_path and core_directory()
[ticket/12963] Remove old migration/ folder from tests
[ticket/12963] Revert back to "migrations" folder name for extensions
* develop-ascraeus:
[ticket/13044] Move GMT out of gmdate in functions_acp
[ticket/13044] Move GMT out of gmdate()
[ticket/13044] \G\M\T to GMT in whole project
[ticket/13044] move GMT string out of gmdate()
[ticket/13044] Correct Expires headers
