* 'develop' of https://github.com/phpbb/phpbb3: (29 commits)
[ticket/11588] Also use version.phpbb.com in install_update.php.
[ticket/11587] Add functional tests for group teampage settings
[ticket/11538] Add admin as admins leader and moderator in memberlist_test
[ticket/11587] Pass legend and teampage settings to group_create()
[ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
[ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
[ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
[ticket/11586] Combine administrator/moderator checks together.
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
[ticket/11122] Add dhruv to active authors
[ticket/11122] Remove Oleg and igorw from active authors
[ticket/10840] Add check_form_key to acp_groups.php
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
[ticket/11409] Add success message after updating group position settings
[ticket/11549] Add functional test for ACP Extension Module with Template
[ticket/11570] Fix link and make the notice more conspiciuous
[ticket/11549] Do not set extension dir path for style in adm/index.php
[ticket/11570] Add link back to update process
[ticket/11569] Add type parameter and fix language variable
[ticket/11569] Add parameter to URL and remove comment
...
Conflicts:
tests/functional/common_groups_test.php
The group_legend and group_teampage settings, which are needed for the
teampage, are tested with these newly added functional tests.
Duplicate code has been reduced as much as possible.
PHPBB3-11587
* ticket/11568:
[ticket/11568] Split status code and html debug assertion into two methods
[ticket/11568] Add comma at end of array key-value couple
[ticket/11568] Invert logic for asserting the response
[ticket/11568] Use static calls for static methods
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* ticket/11568:
[ticket/11568] Add method to get page content
[ticket/11568] Allow different status codes
[ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
[ticket/11568] Fix common_groups_test.php form handling
[ticket/11568] Make CookieJar static aswell
[ticket/11568] Remove manual calls to assert_response_success()
[ticket/11568] Only use a static version of the client
[ticket/11568] Any output before the doc type means there was an error
[ticket/11568] Set client manually so we can increase the cURL timeout
[ticket/11568] Use Goutte Client to install the board for functional tests
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
* develop-olympus:
[ticket/11538] Cut functional tests down a bit as these are more expensive.
[ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
[ticket/11538] Add unit tests for phpbb_validate_hex_colour().
* develop-olympus:
[ticket/11538] Add optional switch as argument to hex colour validation
[ticket/11538] Modify test colour values
[ticket/11538] Limit comment in acp_groups to 80 characters per line
[ticket/11538] Move group ID into abstract test class and add more test cases
[ticket/11538] Merge calls to validate_data() in acp_groups
[ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
[ticket/11538] Use abstract class for functional test cases for group colour
[ticket/11538] Add function phpbb_validate_colour for validating colours
[ticket/11538] Make sure regex doesn't allow multiple color values
[ticket/11538] Add tests for acp group manage page
[ticket/11538] Simplify colour value check and remove support for '#'
[ticket/11538] Fix incorrect regex and test for duplicate # in color string
[ticket/11538] Use regex for testing color value and improve tests
[ticket/11538] Make sure group color can't exceed maximum of 6 characters
Conflicts:
phpBB/includes/functions_user.php
phpBB/styles/prosilver/template/ucp_groups_manage.html
The input length for the hex color is now limited to 6 characters and
the support for colors starting with a '#' has been dropped. The allowed
input length of 7 in prosilver seems to have been a relict from old ages
of phpBB3. In order to have proper support for correct checking of the
colour value, the new code was also ported to the ACP groups manage page.
The tests have been modified to reflect the changes to the behavior of
the color check. Tests for the ACP will follow.
PHPBB3-11538
We are now using a regex with preg_match() in order to properly check
if the entered color value is in hex color format or not. A proper
error message is triggered if an incorrect color value is entered and
the prepended '#' is removed if necessary.
PHPBB3-11538
# 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
The ACP function test checks the amount of disabled extensions. Due to
the added disabled extension for the tests of the acp_modules method
get_module_infos(), this needed to be increased from 4 to 5.
PHPBB3-11465
# 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
* nickvergessen/ticket/11491:
[ticket/11491] Copy files back only if we saved them previously
[ticket/11491] Only copy files from phpBB/ext/ the directory exists
[ticket/11491] Correctly remove the store/temp_ext/ directory after use
[ticket/11491] Fix path to the ext/ folder
[ticket/11491] Add extension_acp_test.php to functional group
[ticket/11491] Fix class name of functional test
[ticket/11491] Move file to correct directory
