* develop-ascraeus:
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
Conflicts:
phpBB/styles/subsilver2/template/ucp_attachments.html
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
* nickvergessen/ticket/12976:
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
* develop-ascraeus:
[ticket/13052] Use request class instead of $_POST and request_var()
[ticket/13052] Fix appearances with multiple parameters
[ticket/13052] Remove additional parameter from check_form_key()
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
[ticket/12966] Sort by post_time and post_id where applicable
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
* develop-ascraeus:
[ticket/12822] Fix test runs of avatar manager_test
[ticket/12822] Add method for deleting avatars and use confirm_box
[ticket/12822] Remove "None" option from avatar select boxes
Conflicts:
phpBB/styles/subsilver2/template/ucp_groups_manage.html
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
* github-marc1706/ticket/12822:
[ticket/12822] Fix test runs of avatar manager_test
[ticket/12822] Add method for deleting avatars and use confirm_box
[ticket/12822] Remove "None" option from avatar select boxes
* develop-ascraeus:
[ticket/12938] Remove functional tests for 'Download all attachments'.
[ticket/12938] Remove the 'Download all attachments' feature.
The method will take care of the actual deletion process in the avatar manager.
Additionally, we'll be using a confirm box while deleting the avatar to prevent
users from accidentally deleting their avatars.
PHPBB3-12822
The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.
PHPBB3-12895
Add common core event at the bottom of the includes/ucp/ucp_prefs.php
to allow additional actions (like template variable assignments etc.)
before the page load.
PHPBB3-12828
* develop-ascraeus:
[ticket/12680] Adds variable for guest user
[ticket/12680] Brings back get_username_string()
[ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
[ticket/12680] Still some problems with displaying the nickname in ucp
[ticket/12680] Little changes, but some issues are still there
[ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
[ticket/12680] Adds alternativ text with new variable to contact:
[ticket/12680] Adds second alternativ text and font-size: 0 to remove text
[ticket/12680] Adds alternative text to contact icon in viewtopic.php
[Ticket/12680] - Adds alternative text to contact icon in viewtopic.php
* Crizz0/ticket/12680:
[ticket/12680] Adds variable for guest user
[ticket/12680] Brings back get_username_string()
[ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
[ticket/12680] Still some problems with displaying the nickname in ucp
[ticket/12680] Little changes, but some issues are still there
[ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
[ticket/12680] Adds alternativ text with new variable to contact:
[ticket/12680] Adds second alternativ text and font-size: 0 to remove text
[ticket/12680] Adds alternative text to contact icon in viewtopic.php
* develop-ascraeus: (33 commits)
[ticket/12352] Do not check hashes that don't have the necessary length
[ticket/12352] Update file headers to fit new format
[ticket/12352] Use custom provider collection for auth providers
[ticket/12352] Add checks for existing user_pass_convert to migrations
[ticket/12352] Remove usages of user_pass_convert column
[ticket/12352] Update schema json file
[ticket/12352] Remove user_pass_convert column from database
[ticket/12352] Check each newly added passwords driver in manager_test
[ticket/12352] Add get_settings_only method to passwords driver base
[ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
[ticket/12352] Add tests for wcf1 and wcf2 drivers
[ticket/12352] Add driver for woltlab community framework 1 passwords
[ticket/12352] Add driver for woltlab community framework 2 passwords
[ticket/12352] Add missing $ to md5_mybb and md5_vb driver
[ticket/12352] Fix spacing in passwords tests
[ticket/12352] Add passwords driver for vB passwords
[ticket/12352] Use correct hashing method in md5_mybb driver
[ticket/12352] Add driver for myBB md5 passwords
[ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
[ticket/12352] Add passwords driver for sha1 password hashes
...
* github-marc1706/ticket/12352: (33 commits)
[ticket/12352] Do not check hashes that don't have the necessary length
[ticket/12352] Update file headers to fit new format
[ticket/12352] Use custom provider collection for auth providers
[ticket/12352] Add checks for existing user_pass_convert to migrations
[ticket/12352] Remove usages of user_pass_convert column
[ticket/12352] Update schema json file
[ticket/12352] Remove user_pass_convert column from database
[ticket/12352] Check each newly added passwords driver in manager_test
[ticket/12352] Add get_settings_only method to passwords driver base
[ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
[ticket/12352] Add tests for wcf1 and wcf2 drivers
[ticket/12352] Add driver for woltlab community framework 1 passwords
[ticket/12352] Add driver for woltlab community framework 2 passwords
[ticket/12352] Add missing $ to md5_mybb and md5_vb driver
[ticket/12352] Fix spacing in passwords tests
[ticket/12352] Add passwords driver for vB passwords
[ticket/12352] Use correct hashing method in md5_mybb driver
[ticket/12352] Add driver for myBB md5 passwords
[ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
[ticket/12352] Add passwords driver for sha1 password hashes
...
