* github-nickvergessen/ticket/12370:
[ticket/12370] Add unit tests for topic notifications
[ticket/12370] Fix functional notification test and remove unneeded requests
[ticket/12370] Do not delete topic notifications when the topic is visible
* github-nickvergessen/ticket/12331:
[ticket/12331] Add functional test for saving custom profile fields
[ticket/12331] Fix SQL error when inserting a new entry to profile field data
* 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
* vsephpbb/ticket/12043:
[ticket/12043] Fix order of disabled extensions in unit tests
[ticket/12043] Correct try/catch exceptions for invalid extensions
[ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
* crizz0/ticket/9758:
[ticket/9758] Clickable avatar in header and renamed class for avatar-img
[ticket/9758] Remove unnessary if-question for include functions_display
[ticket/9758] Slims the line 4775 in includes/functions.php
[ticket/9758] Adds id and changes filter to fix travis CI test
[ticket/9758] Removed the needless space after first ENDIF
[ticket/9758] Adding impr. for overall_header display of avatar and username
[ticket/9758] Fixed bug in mcp_warn.php
[ticket/9758] Optimises the html code of avatar image in header
[ticket/9758] Error because of missing functions_display.php fixed
[ticket/9758] Removed useless if-conditions to include functions.php
[ticket/9758] Changes class name of new "span" in overall_header.html
[ticket/9758] Adds global template variable CURRENT_USER_AVATAR
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
* 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
* develop-olympus:
[ticket/12176] Reword comment about config entries.
[ticket/12176] Add newest_user_colour to config array to ensure it exists
[ticket/12176] Display correct message when trying to delete founder.
[ticket/12176] Add functional test for founder deletion message.
Conflicts:
tests/test_framework/phpbb_functional_test_case.php