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/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
* bantu/ticket/12176:
[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.
* remotes/upstream/develop-olympus:
[ticket/12106] Combined first and second sentence
[ticket/12106] Adds a explaination that admin/mods still able to use the board
Conflicts:
phpBB/language/en/acp/board.php
* github-nickvergessen/ticket/12235:
[ticket/12235] Convert WLM to custom profile field
[ticket/12187] Do not make clickable when using as contact field
[ticket/12187] Split generate_profile_fields_template() into 2 methods
[ticket/12187] Remove user_website field
[ticket/12187] Remove user_website functionality
[ticket/12187] Convert website field data to custom profile field
[ticket/12187] Add URL type for profile fields
[ticket/12234] Replace ICQ with custom profile field
[ticket/12233] Update schema file
[ticket/12233] Add images back to subsilver2
[ticket/12233] Allow profile fields to be contact fields
Conflicts:
phpBB/adm/style/acp_prune_users.html
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
# By Joseph Warner (188) and others
# Via Andreas Fischer (41) and others
* 'develop' of github.com:phpbb/phpbb3: (435 commits)
[ticket/11745] Correct language, coding guidelines
[ticket/11828] Fix greedy operators in lexer
[ticket/11835] Fix ucp_auth_link adding in migration
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
[ticket/develop/11832] Fix path detection
[ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
[ticket/11833] Fix bad template loop
[feature/oauth] Fix tabindex
[ticket/11816] !$DOESNT_EXIST test
[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
[ticket/11829] Use report_closed to determine status in MCP report_details
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
[ticket/11215] Remove unnecessary comment
[ticket/11755] MySQL upgrader out of date
[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
[ticket/11823] Set up nginx server to match PHP files with characters after .php
[ticket/11812] Fix empty define
[ticket/11818] Update Symfony dependencies to 2.3.*
[feature/oauth] Fix bug on ucp_auth_link related to error display
...
