* develop-olympus:
[ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
Conflicts:
phpBB/styles/prosilver/template/ucp_groups_manage.html
* EXreaction/ticket/11415:
[ticket/11415] Add test for find_from_extension()
[ticket/11415] Send the extension base the finder rather than the manager
[ticket/11415] Create function in finder find_from_extension
[ticket/11415] Fix ext.manager constructor in tests
[ticket/11415] Make migrator/ext.manager dependencies of the base ext class
[ticket/11415] Remove migrator dependency from extension manager
[ticket/11415] Move migrator to base extension class from ext.manager
[ticket/11415] Move while loop from ext manager to acp_extensions.php
Earlier the script would incorrectly remove the word "install"
from the script_path when trying to remove the last folder in the
path named "/install". This would lead to issues when the path
you are installing phpBB contained "install". For example
"/install_test/install" would become "/_test".
This change gets the parent folder instead of replacing all
"install". $name contains /install_test/install/index.php
from start and running dirname() gives /install_test/install.
Running dirname once more gives the parent folder of install,
/install_test.
PHPBB3-11536
The $avatar_errors array needs to be merged into the primary $error array
before the group settings get applied. This is currently not the case.
Functional tests for this will be provided by PR #1401.
PHPBB3-11535
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
[ticket/11533] Update unit tests
[ticket/11533] Fix colspan and unnecessary tables
[ticket/11533] Change list to table for notification settings
[ticket/11533] Columns counter for notification settings
# By Marc Alexander (8) and Joas Schilling (3)
# Via Marc Alexander
* remotes/Marc/ticket/11465:
[ticket/11465] Increase count of disabled extensions to 5 in functional test
[ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
[ticket/11465] Add tests for optional arguments of get_module_infos()
[ticket/11465] Add comments explaining the tests
[ticket/11465] Check if class exists before including info file
[ticket/11465] Correctly set the root path for the test
[ticket/11465] The info file does not have _info suffix
[ticket/11465] Add phpBB module to test
[ticket/11465] Move require_once() in unit test to the top of the file
[ticket/11465] Add unit tests for acp_modules::get_module_infos()
[ticket/11465] Use extension finder when adding extensions' acp modules
There was no space between ; and the string "url=". But according to w3c, we
should have atleast one space between them. So, added space characters
accordingly.
PHPBB3-11105
* develop-olympus:
[ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
[ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
[ticket/11513] Use PHPUnit from composer in .travis.yml.
[ticket/11513] Update (all) composer dependencies.
[ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.
Conflicts:
.travis.yml
phpBB/composer.lock
# By Matt Friedman
# Via Matt Friedman
* VSEphpbb/ticket/10155:
[ticket/10155] Update copyright in new migration file to 2013
[ticket/10155] Make effectively installed test more specific
[ticket/10155] Use more descriptive title for migration file
[ticket/10155] Use new migration file for jQuery config update
[ticket/10155] Update jQuery to 1.8.3
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
[ticket/10325] move migration into a new file
[ticket/10325] fix acp language
[ticket/10325] use assert_response_success parts
[ticket/10325] fix language in acp and ucp
[ticket/10325] add assert_response_success in test
[ticket/10325] functional tests for forgot password functionality
[ticket/10325] add logout function in functional_test_case
[ticket/10325] fix language in acp and ucp
[ticket/10325] improve acp option language
[ticket/10325] fix language key
[ticket/10325] fix language variable
[ticket/10325] change language var
[ticket/10325] fix language
[ticket/10325] add new config value to database
[ticket/10325] trigger error if forgot password option disabled
[ticket/10325] add allow forgot password option in acp
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11450:
[ticket/11450] Limit scopes of filters and add better docs
[ticket/11450] Use helpers to copy/remove files
[ticket/11450] Move mocked class into mock/metadata_manager.php
[ticket/11450] Add new line at end of file
[ticket/11450] Fix tests class name
[ticket/11450] Require db_tools file to be included
[ticket/11450] Add test for unexisting composer.json
[ticket/11450] Test the extensions details page in ACP Customise Tab
[ticket/11450] Fix all instances of phpbb_extension_metadata_manager
[ticket/11450] Fix doc blocks and add missing class var $config
[ticket/11450] Sort parameters alphabetically
[ticket/11450] Remove unused $db and $phpEx from metadata_manager construct()
