* naderman/ticket/10932:
[ticket/10932] Use included composer.phar in build process
[ticket/10932] Adding composer.phar to the repository to version it
* unknownbliss/ticket/10640:
[ticket/10640] Change subject length in mcp in subsilver
[ticket/10640] Change subject length in MCP
[ticket/10640] Do not change default value of truncate_string()
[ticket/10640] Change maximum subject length
The default value should be kept, so we do not change the behaviour for MODs
and Extensions that use the function with its default values.
PHPBB3-10640
* github-p/ticket/10882:
[ticket/10882] Fix test name - oops.
[ticket/10882] Add a test for including a nonexistent file.
[ticket/10882] Add test for an ENDIF without IF.
[ticket/10882] Add test for an invalid template tag.
* github-dhruvgoel92/feature/delete-auto-logins:
[feature-delete-auto-logins] adds module to database update
[feature/delete-auto-logins] fixes style
[feature/delete-auto-logins] improves styling
[feature/delete-auto-logins] fixes language entry
[feature/delete-auto-logins] fix language keys and styling
[feature/delete-auto-logins] explain persistent keys in the ucp.
[feature/delete-auto-logins] template added for subsilver2
[feature/delete-auto-logins] improved styling and fixes language
[feature/delete-auto-logins] using loop for errors
[feature/delete-auto-logins] fixes css corners
[feature/delete-auto-logins] Fixes language entries
[feature/delete-auto-logins] checks form key
[feature/delete-auto-logins] Fixes language entries and redirection.
[feature/delete-auto-logins] User can view/delete auto logins.
* bantu/ticket/10931:
[ticket/10931] Apply strtolower() correctly, i.e. not on false.
[ticket/10931] Also test get_bytes() and get_string() with false.
[ticket/10931] Make to_numeric function globally available.
[ticket/10931] Make sure get_bytes() always returns either an int or a float.
[ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes().
[ticket/10931] Use strict assertSame() instead of assertEquals().
[ticket/10931] Also test for negative values.
[ticket/10931] Also test lower case units in test_get_bytes().
[ticket/10931] Correctly use GNU GPL version 2.
[ticket/10931] Make it clear that we are mocking the ini_get() function.
[ticket/10931] Document that false is also returned if value is not well formed
[ticket/10931] Correct method description of get_string().
[ticket/10931] Let us try ini_get() without error suppression.
[ticket/10931] Unit tests for phpbb_php_ini class.
[ticket/10931] Add wrapper class for ini_get function.
* develop-olympus:
[develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
[develop-olympus] Add changelog for 3.0.11 release.
[develop-olympus] Bump version numbers for 3.0.11-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.11 releases.
Conflicts:
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
