* github-elsensee/ticket/stenudd/8558-2:
[ticket/8558] Fix operator
[ticket/8558] Fix field length in ACP
[ticket/8558] Use only one variable and improve explain string
[ticket/8558] Add config in migrations and schema_data
[ticket/8558] Add display name in emails from board
Conflicts:
phpBB/includes/functions_messenger.php
* 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
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12349:
[ticket/12349] Fix Sniffer for @license tag
[ticket/12349] Update license header in several new files
* Marc/ticket/12150:
[ticket/12150] Use correct license URL in prune shadow migrations file
[ticket/12150] Remove 'after' for columns from migrations file
[ticket/12150] Update schema files for prune shadow topics
[ticket/12150] Use log service instead of add_log() function
[ticket/12150] Use shorter column names for prune settings
[ticket/12150] Add functional tests for pruning shadow topics
[ticket/12150] Add missing space to query for shadow topics
[ticket/12150] Add missing prune settings variables in acp_forums
[ticket/12150] Add file and caller for pruning shadow topics
[ticket/12150] Add prune columns to schema files and migration file
[ticket/12150] Add options to acp
All columns were renamed from having prune_shadow_topics as namebase to just
prune_shadow.
A missing column was also added to the migration file's remove_schema() method.
PHPBB3-12150
This migration will always be skipped on updates, because database_update.php
creates the table. But the create schema script requires the migration,
so the table is created for new installs.
PHPBB3-11459
* dhruv/ticket/11040:
[ticket/11040] Topic is deleted if test is skipped
[ticket/11040] Use unique text for the test post added
[ticket/11040] Use hard delete in delete_topic
[ticket/11040] Add migration to drop postgres search indexes
[ticket/11040] Delete the functional test topic to avoid conflicts
[ticket/11040] Add methods to delete post and topic in functional tests
[ticket/11040] Swap post_text and post_subject for post_content index
[ticket/11040] Add test cases for searching subject and post content together
[ticket/11040] Remove postgres extra indexes
[ticket/11040] Add post_content index
[ticket/11040] Search subject and text together
* EXreaction/ticket/11716:
[ticket/11716] Correct license URL
[ticket/11716] Fix dependencies in migration files
[ticket/11716] Rename migration files and add note that it's converting a MOD
[ticket/11716] Convert Soft Delete Mod to post/topic visibility
Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages
PHPBB3-12233