* 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
The following labels had invalid id references:
1. joined (renamed to link to joined_after)
2. group_id (create teh id attribute on select box)
PHPBB3-12245
* Crizz0/ticket/12126:
[ticket/12126] deleted left:0 and right:0 in responsive.css .phpbb_alert
[ticket/12126] left:0 and right: 0; admin.css --> width: auto
[ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px"
[ticket/12126] Fixed position of alert box in IE
* develop-olympus:
[ticket/11509] Exit with the expected (non-zero) exit status on failure.
[ticket/11509] Output which commit is being inspected.
[ticket/11509] Three dots means sym. difference, but we only want new commits.
Conflicts:
.travis.yml
* bantu/ticket/11509:
[ticket/11509] Exit with the expected (non-zero) exit status on failure.
[ticket/11509] Output which commit is being inspected.
[ticket/11509] Three dots means sym. difference, but we only want new commits.
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
The size of the template block array is calculated within a foreach loop
iterating through the array, which is unnecessary. It only needs to be done
once. In a block of 1000 rows, this results in
500,500 calls to sizeof() in this location. With this change, that's reduced to
1000.
PHPBB3-12232
* nickvergessen/ticket/12205:
[ticket/12205] Do not display 0 for empty integers when show_novalue is off
Conflicts:
phpBB/includes/functions_profile_fields.php
[ticket/12220] Fix division by zero in search page with no results.
* prototech/ticket/12220:
[ticket/12220] Fix division by zero in search page with no results.
The page url parameter no longer exists in the pagination.on_page() method,
therefore the page url passed is being divided by 0 - the total number of
items. Since PAGE_NUMBER is assigned in generate_template_pagination(), this
separate assignment is no longer needed.
PHPBB3-12220
