* develop-olympus:
[ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
[ticket/9751] Compare $password with empty string instead of casting it to bool
[ticket/9751] Use a switch/case block without break for password complexity.
[ticket/9751] Password requirement "Must contain letters and numbers" fails
* ticket/9549:
[ticket/9549] Display users in their primary group instead of their first group
[ticket/9549] Change default value of "sort legend by group name" to false.
[ticket/9549] Fix displaying empty groups
[ticket/9549] Fix language strings.
[ticket/9549] Only add group to legend/teampage when the checkbox is checked.
[ticket/9549] New method move() to move a group more than 1 up/down.
[ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
[ticket/9549] Throw an error when the given field-name is invalid.
[ticket/9549] Make the class non static and extend delete_group function.
[ticket/9549] Add template changes for subsilver2.
[ticket/9549] Enhance teampage and legend functionality
[ticket/9549] Add the module and files for the ACP.
[ticket/9549] Update database with the new config values and columns
[ticket/9549] Enhance teampage functionality with a new class, group_positions.
Conflicts:
phpBB/install/database_update.php
* develop-olympus:
[task/session-tests] Make result check independent of returned row order.
[task/session-tests] By default the cache check now skips over db server info
[task/session-tests] Correctly display message on session continue test failure
[task/session-tests] Make the session id replacement of dataset values clearer
Conflicts:
tests/mock/cache.php
* develop-olympus:
[ticket/10052] Add comments to the session testable factory.
[ticket/10052] Correct session tests, and separate session factory from tests
* develop-olympus:
[ticket/10049] Mark session init test incomplete for now.
[ticket/10049] Mark session continue test incomplete for now.
[ticket/10049] Globalize $_SID.
[ticket/10049] Chase assertResultEquals rename.
[ticket/10049] Fixed requires in session tests and mock.
[ticket/10049] Renamed session test files to proper file names.
cd694e9b9dfd59c8be00a52b30db8e6c280b97a9 renamed
assertResultEquals to assertSqlResultEquals. However, since the
session tests were never executed calls in them were never
updated.
Parameter order also changed; chase that too.
PHPBB3-10049
* develop-olympus:
[task/refactor-db-testcase] Further improve error messages.
[task/refactor-db-testcase] Do not show db password on connect error
[task/refactor-db-testcase] Improve error message of db tests
[task/refactor-db-testcase] Refactor phpbb_database_test_case
