* VSEphpbb/ticket/10390:
[ticket/10390] Revert back to escaped script tags inside document.write
[ticket/10390] Fix wording: fallback should be fall back
[ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
[ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
[ticket/10390] Drop http protocol for Microsoft's CDN option
[ticket/10390] Reword the language for jQuery host/server options
[ticket/10390] Fix a type-o - captialize AJAX
[ticket/10390] Improve the jQuery CDN url generation function
[ticket/10390] Move jQuery version definition
[ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Conflicts:
phpBB/install/database_update.php
jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.
PHPBB3-10390
Like Google, Microsoft supports both http and https protocols, so we
can drop the protocol alltogether from the url so the Microsoft CDN
will work on both HTTP or HTTPS sites without issue. Also I cleaned
up some of the comments here.
PHPBB3-10390
Per p's comments, return the remote url from a variable instead of
using multiple returns. Also put the logic for creating Google's version
on its own line, and count the version number's dots instead of length
so it will be less likely to break if jQuery goes to version 1.10.
PHPBB3-10390
Removed all use of the DB for serving/caching the theme from style.php,
acp_style no longer stores the theme modified time either.
As a consequence currently all stylesheets will be served through style.php
(with no caching) until imagesets are removed [PHPBB3-10336], then
they can we served as static files by HTTPd.
PHPBB3-9741
* develop-olympus:
[ticket/10370] Add function documentation for get_stacktrace().
[ticket/10370] Explain that we are not the ones hiding backtrace pieces.
[ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path().
[ticket/10370] Add require_once to whitelisted functions.
[ticket/10370] Use single string instead of an array for arguments.
[ticket/10370] Ease up code checking for arguments of include etc.
[ticket/10370] Use unset() on the first backtrace instead of checking in loop.
[ticket/10370] Use phpbb_filter_root_path() in get_backtrace().
* develop-olympus:
[ticket/10369] Replace root path with "[ROOT]" as per IRC.
[ticket/10369] Add warning about paths outside of phpBB root not being filtered
[ticket/10369] Rename filter_errfile() to filter_root_path().
[ticket/10369] DRY code to remove phpbb path from errfile.
[ticket/10369] Always include errfile and errline in format_errors().
* develop: (157 commits)
[ticket/10316] Resolve inconsistent move topic behavior
[ticket/9297] Add network to class name of unit tests.
[ticket/9297] Fix typo in localhost.
[ticket/9297] Rename test class to reflect its contents.
[ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.
[ticket/9297] Fix markTestSkipped call in setUpBeforeClass.
[ticket/9608] Remove use of references in topic_review
[ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.
[ticket/9297] Separate ipv4 and ipv6 tests into separate functions.
[ticket/9297] Update copyright year of unit test file.
[feature/template-engine] Delete _get_locator function.
[feature/template-engine] Clean up template locator usage in bbcode.
[ticket/9297] Make EPSV unit tests work without IPv6.
[ticket/9297] Unit tests for ftp_fsock PASV and EPSV.
[ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
[ticket/10312] Un-check the shadow option while moving.
[feature/template-engine] Need to call set_template on template.
[feature/template-engine] Update installer for template engine changes.
[feature/template-engine] Dependency inject locator into template.
[feature/template-engine] Delete useless code from set_template.
...
Conflicts:
phpBB/includes/functions.php
* github-p/feature/template-engine: (87 commits)
[feature/template-engine] Delete _get_locator function.
[feature/template-engine] Clean up template locator usage in bbcode.
[feature/template-engine] Need to call set_template on template.
[feature/template-engine] Update installer for template engine changes.
[feature/template-engine] Dependency inject locator into template.
[feature/template-engine] Delete useless code from set_template.
[feature/template-engine] Delete no longer used $template_filename property.
[feature/template-engine] Delete useless $template globalization.
[feature/template-engine] Use template engine class in bbcode class.
[feature/template-engine] Corrected an error message in template locator.
[feature/template-engine] Remaining documentation.
[feature/template-engine] More documentation for template class.
[feature/template-engine] Create load_and_render to reduce code duplication.
[feature/template-engine] Get rid of orig_tpl_* in template engine.
[feature/template-engine] Delete $style_name param from locator's set_custom_template.
[feature/template-engine] Add constructor to template locator.
[feature/template-engine] Factor template locator out of template class.
[feature/template-engine] Delete $files_template property.
[feature/template-engine] Rename is_absolute to phpbb_is_absolute.
[feature/template-engine] Test template DEFINE statements across files
...
Conflicts:
.gitignore
phpBB/includes/template.php
* github-igorw/ticket/10258:
[ticket/10258] Remove the meta charset tag
[ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
[ticket/10258] Remove copyright meta tag from docs
[ticket/10258] Remove resource-type and distribution meta tags
[ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
[ticket/10258] Change the DOCTYPE to HTML5
* develop-olympus:
[ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.
[ticket/10257] Fix AAAA record parsing for old versions of Windows
[ticket/10257] Add missing break statement after CNAME block.
* github-bantu/ticket/10257:
[ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.
[ticket/10257] Fix AAAA record parsing for old versions of Windows
[ticket/10257] Add missing break statement after CNAME block.
