[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/12531] Restore default topic link behavior to subsilver2
* VSEphpbb/ticket/12531:
[ticket/12531] Add some line breaks to really long lines
[ticket/12531] Restore default topic link functionality in subsilver2
[Ticket/12555] Make use of canonical urls to avoid duplicate content
* nickvergessen/ticket/12555:
[ticket/12555] Add canonical URL for viewtopic
[ticket/12555] Add canonical URL for viewforum
[ticket/12555] Add canonical URl for memberlist mode=viewprofile
[ticket/12555] Allow to set canonical URLs to avoid duplicate content
In language/en/common.php:
* Introduce a new language variable 'CONTACT' => 'Contact'
* Add a string argument to lang var 'CONTACT_USER' to avoid an appended
'{USERNAME}' in template.
* Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended
'{USERNAME}' in template.
Also fix typos.
PHPBB3-12525
[ticket/9388] Only display the settings for the selected method in the auth and search ACP pages.
* prototech/ticket/9388:
[ticket/9388] Use "togglable" instead of "toggable"
[ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
[ticket/9388] Reopen <fieldset> after auth templates.
[ticket/9388] Fix unit tests.
[ticket/9388] Use the new toggle function for the avatar type <select>.
[ticket/9388] Display only the settings for the selected search backend.
[ticket/9388] Display only the settings for the auth method that's selected.
[ticket/9388] Add support for making <select> options able to toggle settings.
[ticket/12440] Set browser URL to point to specific post when using view=unread
* prototech/ticket/12440:
[ticket/12440] Use a more generic approach for replacing the URL.
[ticket/12440] Set browser URL to point to specific post when using view=unread
Conflicts:
phpBB/styles/prosilver/template/viewtopic_body.html
[ticket/12513] Add simple_header head event with support for asset calls
* VSEphpbb/ticket/12513:
[ticket/12513] Add asset include support to simple header/footer in ACP
[ticket/12513] Add simple_header head event with support for CSS assets calls
* github-vse/ticket/12254:
[ticket/12254] Add subsilver2 support for cookie storage instead of SID
[ticket/12254] Use a cookie instead of SID to store language selection
[ticket/12254] No longer need to add change_lang to the URL params
[ticket/12254] Use 'language' instead of 'set_lang' as the variable name
[ticket/12254] Persist set_lang after reg only if changed from default
[ticket/12254] Add set_lang var changes to subsilver2 files
[ticket/12254] Use new set_lang var to avoid conflict with change_lang
[ticket/12254] Stop using deprecated request_var in user class
[ticket/12254] Better language switching on registration page