* develop-ascraeus:
[ticket/12407] Remove merge marker from posting.php
[ticket/12407] Fix incorrect @since line in event
[ticket/12407] Merge @change in doc block of event
[ticket/12407] Assign template variables again after merging develop-ascraeus
[ticket/12407] Add message_parser as passed variable to event
[ticket/12407] Allow changing of post_data, etc. at end of posting.php
[ticket/12407] Allow changing of post_data, etc. at end of posting.php
* marc1706/ticket/12407:
[ticket/12407] Remove merge marker from posting.php
[ticket/12407] Fix incorrect @since line in event
[ticket/12407] Merge @change in doc block of event
[ticket/12407] Assign template variables again after merging develop-ascraeus
[ticket/12407] Add message_parser as passed variable to event
[ticket/12407] Allow changing of post_data, etc. at end of posting.php
[ticket/12522] Add function parameter description in guesser interface
* n-aleha/ticket/12522:
[ticket/12522] Add function parameter description in guesser interface
* develop-ascraeus:
[ticket/12476] Label the constructor as public
[ticket/12476] Increase assets also from acp_styles and phpbbcli
[ticket/12476] Increase asset version on cache purge
[ticket/12476] Increase assets version on cache purge
* n-aleha/ticket/12476:
[ticket/12476] Label the constructor as public
[ticket/12476] Increase assets also from acp_styles and phpbbcli
[ticket/12476] Increase asset version on cache purge
* develop-ascraeus:
[ticket/10839] Remove version compare as the php minimum requirement is 5.3.3
[ticket/10839] Fix note about running slow tests and build task
[ticket/10839] Removing phpunit.xml.all
[ticket/10839] Always run functional tests by default
Ticket/10839 Remove phpunit configuration files
* nickvergessen/ticket/10839:
[ticket/10839] Remove version compare as the php minimum requirement is 5.3.3
[ticket/10839] Fix note about running slow tests and build task
[ticket/10839] Removing phpunit.xml.all
[ticket/10839] Always run functional tests by default
They are skipped anyway, if $phpbb_functional_url is not configured.
If you want to run tests without functional tests, just append
--exclude-group functional
to your call
PHPBB3-10839
* 'develop-ascraeus' of github.com:phpbb/phpbb: (424 commits)
[ticket/12428] Use the database to store the original version number
[ticket/12493] Add functional test
[ticket/12493] Fix sql query for selection of users that have disabled PM
[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/12511] Add missing titles for profile fields in members group view
[ticket/12428] Incorrect from version in database update log entry
[ticket/12510] Convert & to & in build_url() when no params are stripped.
[ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
[ticket/12440] Use a more generic approach for replacing the URL.
[ticket/12507] Move the 'require' statement
[ticket/12507] Add console command to purge the cache
[ticket/12421] Rebase and enable tests
[ticket/12421] Don't parse [attachment] tags if user can't view them
[ticket/12325] Use \RecursiveDirectoryIterator
[ticket/12325] Doc blocks
[ticket/12440] Set browser URL to point to specific post when using view=unread
[ticket/12357] Support routes in generate_smilies() function.
[ticket/12459] Change language strings
[ticket/12504] Use local variables where possible
...
Conflicts:
phpBB/posting.php
* 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
