* develop-ascraeus:
[ticket/12451] Remove duplicated lang var
[ticket/12451] Use new line to concatenate strings
[ticket/12451] Split TOO_MANY_CHARS vars for plurals
[ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
[ticket/12451] Split lang vars in posting.php for plurals
* Elsensee/ticket/12451:
[ticket/12451] Remove duplicated lang var
[ticket/12451] Use new line to concatenate strings
[ticket/12451] Split TOO_MANY_CHARS vars for plurals
[ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
* develop-ascraeus:
[ticket/12025] Apply DeMorgan
[ticket/12025] Fixing the condition....
[ticket/12025] Don't show any error on preview if the message is empty
[ticket/12025] Post Preview no longer shows warnings
[ticket/12025] Post Preview no longer shows warnings
* Nicofuma/ticket/12025:
[ticket/12025] Apply DeMorgan
[ticket/12025] Fixing the condition....
[ticket/12025] Don't show any error on preview if the message is empty
[ticket/12025] Post Preview no longer shows warnings
* develop-ascraeus:
[ticket/12325] Use \RecursiveDirectoryIterator
[ticket/12325] Doc blocks
[ticket/12325] Change private function to protected
[ticket/12325] Add visibilities
[ticket/12325] Add files located in deleted dirs
[ticket/12325] Generate the list of the deleted files and folders
[ticket/12325] Generate the list of the deleted files and folders
* Nicofuma/ticket/12325:
[ticket/12325] Use \RecursiveDirectoryIterator
[ticket/12325] Doc blocks
[ticket/12325] Change private function to protected
[ticket/12325] Add visibilities
[ticket/12325] Add files located in deleted dirs
[ticket/12325] Generate the list of the deleted files and folders
* develop-ascraeus:
[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
[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/12510] Convert & to & in build_url() when no params are stripped.
* prototech/ticket/12510:
[ticket/12510] Convert & to & in build_url() when no params are stripped.
* develop-ascraeus:
[ticket/12428] Use the database to store the original version number
[ticket/12428] Incorrect from version in database update log entry
[ticket/12428] Incorrect from version in database update log entry
* Nicofuma/ticket/12428:
[ticket/12428] Use the database to store the original version number
[ticket/12428] Incorrect from version in database update log entry
[ticket/12511] Add missing titles for profile fields in members group view
* rxu/ticket/12511:
[ticket/12511] Add missing titles for profile fields in members group view
* develop-ascraeus:
[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
[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
[ticket/12493] Fix sql query for selection of users that have disabled PM
* n-aleha/ticket/12493:
[ticket/12493] Add functional test
[ticket/12493] Fix sql query for selection of users that have disabled PM
This fixes a bug where a user A could not send a PM to user B when both users
allowed other users to send them a PM. More precisely, it fixes the selection
of users that either are inactive or have disabled private messages.
PHPBB3-12493
For memberlist group view in cases the group is presented with the group leader
and group members, for members profile fields titles are missing: Posts,
Joined, Last active and custom profile fields titles.
PHPBB3-12511
[ticket/12421] Don't parse [attachment] tags if user can't view them
* Nicofuma/ticket/12421:
[ticket/12421] Rebase and enable tests
[ticket/12421] Don't parse [attachment] tags if user can't view them
[ticket/12507] Add console command to purge the cache
* Nicofuma/ticket/12507:
[ticket/12507] Move the 'require' statement
[ticket/12507] Add console command to purge the cache
