* 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
Currently it is possible to change search results within the search row scope,
but it should be possible to modify/unset every individual row
within the rowset.
PHPBB3-12524
[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
Since a call was added to self::approve_topic(), the poster would
get double-notified about it (even if it was later marked as read).
Also, when creating a new topic with a quote, it would not be
notified, this has also been fixed.
PHPBB3-12270
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
