* develop-olympus:
[ticket/10056] Corrected a typo in Firebird name.
[ticket/10041] Use send_status_line more in download/file.php
Conflicts:
phpBB/download/file.php
* develop-olympus:
[ticket/7778] Update all the schema files
[ticket/7778] Add the column change to `mysql_upgrader.php`
[ticket/7778] BBCode single limit
Conflicts:
phpBB/install/database_update.php
* ticket/erikfrerejean/7778:
[ticket/7778] Update all the schema files
[ticket/7778] Add the column change to `mysql_upgrader.php`
[ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.
Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes
PHPBB3-7778
* develop-olympus:
[ticket/10052] Add comments to the session testable factory.
[ticket/10052] Correct session tests, and separate session factory from tests
* ticket/naderman/10052:
[ticket/10052] Add comments to the session testable factory.
[ticket/10052] Correct session tests, and separate session factory from tests
* develop-olympus:
[ticket/9675] Correctly check whether the style/component is still in use.
[ticket/9675] Put the code into methods to avoid code duplication.
[ticket/9675] Adjust the language-string to reflect the changes.
[ticket/9675] Add option to delete template/theme/imageset when deleting style.
* ticket/nickvergessen/9675:
[ticket/9675] Correctly check whether the style/component is still in use.
[ticket/9675] Put the code into methods to avoid code duplication.
[ticket/9675] Adjust the language-string to reflect the changes.
[ticket/9675] Add option to delete template/theme/imageset when deleting style.
For posts/topics which have not been edited/updated, use the creation
date to populate atom:updated, as suggested by bantu. This should
increase compatibility with user agents which expect an atom:updated
element.
PHPBB3-10009
Change the handling of dates to differentiate between the date when an
entry was published and the date on which it was last updated.
Incorporate this information into the Atom feed by using <published> and
<updated> appropriately according to sections 4.2.9 and 4.2.15 of the
spec.
PHPBB3-10009
* develop-olympus:
[ticket/10049] Mark session init test incomplete for now.
[ticket/10049] Mark session continue test incomplete for now.
[ticket/10049] Globalize $_SID.
[ticket/10049] Chase assertResultEquals rename.
[ticket/10049] Fixed requires in session tests and mock.
[ticket/10049] Renamed session test files to proper file names.
* ticket/p/10049:
[ticket/10049] Mark session init test incomplete for now.
[ticket/10049] Mark session continue test incomplete for now.
[ticket/10049] Globalize $_SID.
[ticket/10049] Chase assertResultEquals rename.
[ticket/10049] Fixed requires in session tests and mock.
[ticket/10049] Renamed session test files to proper file names.
cd694e9b9d renamed
assertResultEquals to assertSqlResultEquals. However, since the
session tests were never executed calls in them were never
updated.
Parameter order also changed; chase that too.
PHPBB3-10049
* develop-olympus:
[ticket/9944] Add empty line before the while() so you can better read the code
[ticket/9944] Extension groups naming don't use users' language in ACP
Conflicts:
phpBB/install/database_update.php
* ticket/nickvergessen/9944:
[ticket/9944] Add empty line before the while() so you can better read the code
[ticket/9944] Extension groups naming don't use users' language in ACP
* develop-olympus:
[ticket/10044] Updated invocation documentation.
[ticket/10044] Stop when failed to retrieve network/collaborators.
[ticket/10044] Added -h to setup_github_network.php.
[ticket/10044] Error handling for remote requests in setup_github_network.php
[ticket/10044] Made setup_github_network.php runnable as a script
* ticket/p/10044:
[ticket/10044] Updated invocation documentation.
[ticket/10044] Stop when failed to retrieve network/collaborators.
[ticket/10044] Added -h to setup_github_network.php.
[ticket/10044] Error handling for remote requests in setup_github_network.php
[ticket/10044] Made setup_github_network.php runnable as a script
