# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11662] Typos: occured -> occurred
Conflicts:
tests/template/template_test.php
* develop-olympus:
[ticket/11548] Use new static methods for request and submit
[ticket/11548] Run array_map on complete error array and not just colour_error
Conflicts:
tests/functional/ucp_groups_test.php
Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.
PHPBB3-11548
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319:
[ticket/8319] Do not repeat the replacement
[ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
[ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
[ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
[ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
Copied from the INCLUDECSS PR, since this needed to be modified.
Added checks for argument strings/anchors/http/https paths in asset files
to load files properly
PHPBB3-11388
* ticket/8319:
[ticket/8319] Do not repeat the replacement
[ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
[ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
[ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
[ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
Conflicts:
phpBB/install/database_update.php
If debug mode is enabled, lets check for new/removed EVENT templates on
page load rather than at compile. This is slower, but makes developing
extensions easier (no need to purge the cache when a new event template
file is added)
PHPBB3-11598
# By David King
# Via David King
* remotes/imkingdavid/ticket/11253:
[ticket/11253] Put AND clause in correct SQL query
[ticket/11253] Fix a few things brought up in the PR
[ticket/11253] Fix typo in constant
[ticket/11253] Add migration to add auth check to UCP signature module
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathan Guse (1)
* develop-olympus:
[ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
[ticket/11619] Some tests for get_remote_file().
Now we can do {L_TITLE|upper}, {SITENAME|lower}, etc
We can also use all the Twig tags in our own syntax. E.g. <!-- BLOCK foo -->
= {% block foo %]. All tags are the same as the Twig tag names, but are
in uppercase.
PHPBB3-11598
# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
[ticket/11617] Remove spaces and tabs from empty lines
[ticket/11617] Missing U_ACTION in acp_captcha.php
[feature/auth-refactor] Fix code style issue
[feature/auth-refactor] Fix comment grammar
[feature/auth-refactor] Fix the actual cause of test failures
[feature/auth-refactor] A possible fix for the functional test failures
[ticket/11566] Subsilver template error displayed after table headers
[ticket/11566] Remove extra pair of brackets from conditional statement
[ticket/11566] Check that guest doesn't have reporting permission by default
[ticket/11566] Add captcha to report post template in subsilver
[ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
[ticket/11566] Rename var to $visual_confirmation_response
[ticket/11566] Revert forum permission changes
[ticket/11566] Use language variable instead of hardcode
[ticket/11566] add tests for reporting post
[ticket/11566] add captcha reset and hidden fields
[ticket/11566] display error instead of trigger_error
[ticket/11566] add error in template
[ticket/11566] add error functionality
[ticket/11566] add interface for captcha
...
