* github-nickvergessen/ticket/10073: (36 commits)
[ticket/10073] Fix button descriptions
[ticket/10073] Do not check disable boxes by default
[ticket/10073] Store values with config_text in the ACP
[ticket/10073] Move config values to config_text
[ticket/10073] Fix request usage
[ticket/10073] Deduplicate template variable names
[ticket/10073] Get service from container
[ticket/10073] Fix more "Contact Us" strings
[ticket/10073] Move template code into the template
[ticket/10073] Make contact page available when board is disabled
[ticket/10073] Change name of the ACP module
[ticket/10073] Deduplicate posting buttons code in ACP
[ticket/10073] Use phpbb_validate_email to verify email address
[ticket/10073] Add tests for new validate_email()
[ticket/10073] Split email validation from email ban and taken checks
[ticket/10073] Deduplicate the if statement
[ticket/10073] Fallback to board_contact when contact page is disabled
[ticket/10073] Remove language string from rebase conflict
[ticket/10073] Add ACP module to add bbcode text for contact admin info
[ticket/10073] Add new configs to the schema
...
[ticket/12655] Run phpbbcli as a shell when --shell or -s is used
* Nicofuma/ticket/12655:
[ticket/12655] Set register_container_commands as public
[ticket/12655] Don't try to restore the definition in the help
[ticket/12655] Fix coding style
[ticket/12655] Make the --shell option available only for phpbbcli.php
[ticket/12655] Fix coding style in \phpbb\console\application
[ticket/12655] Set the arguments of \phpbb\console\application as required
[ticket/12655] Don't require acp/common again in the commands
[ticket/12655] Run the shell when --shell is used
[ticket/11942] Delete post/topic reason should be added to logs
* Nicofuma/ticket/11942:
[ticket/11942] Don't change the reason to '' when hard deleting
[ticket/11942] Don't show the checkbox if the post is already soft-deleted
[ticket/11942] Remove useless IF in templates
[ticket/11942] Apply the modifications to subsilver
[ticket/11942] Always display delete reason
[ticket/11942] Edits messages
[ticket/11942] Change the formulation
[ticket/11942] Adding the reason to hard deleted topic/post
[ticket/11942] Delete post/topic reason should be added to logs
[ticket/12597] Command for executing all available cron tasks
* bantu/ticket/12597:
[ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
[ticket/12597] Improve language for cron:run command.
[ticket/12597] Do not output anything besides the gif image.
[ticket/12597] Command for executing all available cron tasks
* ptitlazy/ticket/12597: (27 commits)
[ticket/12597] Reformating an acp message
[ticket/12597] Modifiying acp message
[ticket/12597] Fix wrong global variable name
[ticket/12597] Typo correction
[ticket/12597] Typo corrections
[ticket/12597] Changing place of lock release in execute() method
[ticket/12597] Fix test file
[ticket/12597] Typing corrections and improvement of code consistency
[ticket/12597] Fix various mistakes
[ticket/12597] Fix various mistakes
[ticket/12597] Fix visibilty of two functions in run.php
[ticket/12597] Refactoring and test improving
[ticket/12597] Fix language key name
[ticket/12597] Fix coding style and typing mistakes
[ticket/12597] Changes name of command cron:run-all to cron:run.
[ticket/12597] Fix various problems
[ticket/12597] Fix constructor bug and servral doc blocs
[ticket/12597] Modification of return statuses and of test files
[ticket/12597] Fix misplaced release of db lock
[ticket/12597] Change EXECUTE to RUN in language
...
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12445:
[ticket/12445] Change the formulation
[ticket/12445] Disapproved post: the name of the poster should be in logs
* github-nickvergessen/ticket/12113:
[ticket/12113] Fix view_log() tests
[ticket/12113] Correctly use plurals when deleting user warnings
[ticket/12113] Allow log entries to use plurals
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
Changing the language string from "Ban usernames" to "Ban users"
to clarify its use. It bans users by their name and not the username itself
PHPBB3-10174
[ticket/8041] Merge item name into "Return to" string for better translations
* nickvergessen/ticket/8041:
[ticket/8041] Add space/tabs after => in array list
[ticket/8041] Wrap forum name, topic title and pm folder name with quotes
[ticket/8041] Merge item name into "Return to" string for better translations
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...