# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv (1)
* develop-olympus:
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
Conflicts:
phpBB/includes/search/fulltext_mysql.php
phpBB/language/en/acp/search.php
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11583:
[ticket/11583] Use a new lang key instead of giving the old one a new meaning.
[ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
Without passing those values, the group is removed from the teampage and
the legend while submitting the edit form on the ucp groups manage page.
PHPBB3-11587
The description says:
"The URL must be relative to the topic page and cannot contain a server name
or protocol."
We now enforce this and will add a new token with the current behaviour back.
PHPBB3-8319
* nickvergessen/ticket/11549:
[ticket/11549] Add functional test for ACP Extension Module with Template
[ticket/11549] Do not set extension dir path for style in adm/index.php
As we don't want style files in adm/adm/style/ we should not prepend the adm/
by setting it. Note, we did that correctly in adm/swatch.php.
PHPBB3-11549
* Elsensee/ticket/11569:
[ticket/11569] Add type parameter and fix language variable
[ticket/11569] Add parameter to URL and remove comment
[ticket/11569] Fixing link to continue update
Fixes a change made in PR 1331 that oversized topic rows.
Icons in topic rows, in Prosilver, are only 27px high, so we do not need
a min-height as high as 40px. Setting it to 30px is more conservative
and reclaims the original height of topic rows from before PR 1331.
http://tracker.phpbb.com/browse/PHPBB3-11577
PHPBB3-11577
I changed the .live function of jQuery for .on function because a user
reported that he had an error because of that, it showed that .live function
was deprecated, so I changed for .on that it's same but it work with new
jQuery versions.
PHPBB3-11516
The underscore after the 'validate' function prefix for the older
functions was dropped by accident in PR #1407. This patch will add it
back.
PHPBB3-11578
* 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
* marc1706/ticket/11538:
[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
