* develop-olympus:
[ticket/10419] Reword the language strings
[ticket/10419] Reword some language strings, minor code changes
[ticket/10419] Add mbstring PHP ini parameters checks to ACP
* rxu/ticket/10419:
[ticket/10419] Reword the language strings
[ticket/10419] Reword some language strings, minor code changes
[ticket/10419] Add mbstring PHP ini parameters checks to ACP
* 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
* develop-olympus:
[ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
[ticket/10278] Also timeout when receiving data over a slow connection.
[ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
[ticket/10278] Return with a timeout error when fread() or fgets() time out.
[ticket/10278] Also set timeout on stream in get_remote_file().
* github-bantu/ticket/10278:
[ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
[ticket/10278] Also timeout when receiving data over a slow connection.
[ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
[ticket/10278] Return with a timeout error when fread() or fgets() time out.
[ticket/10278] Also set timeout on stream in get_remote_file().
The base class for captcha plugins has been renamed, but the old name continues
to exist as an empty subclass of it for backwards compatability.
PHPBB3-10323
To avoid large bc breaking changes, modules in the old includes directory
structure still follow the same naming conventions. Modules in extensions
have to be placed in an xcp/ folder and need a _module suffix. The
corresponding info file is in the same directory but with an _info suffix.
PHPBB3-10323
Search backends are now required to be autoloadable. The database updater to
3.1 tries to guess the class name as phpbb_search_<oldname> which works for
the default backends we ship.
PHPBB3-10323
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
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
The bulk of database storage of templates is removed, rendering template
stored in the database as useless.
Theme database storage is reduced to a skeleton for full removal soon.
This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.
PHPBB3-9741