Andreas Fischer 06379aece8 Merge branch 'develop-olympus' into develop ... * 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		2013-05-26 19:19:08 +02:00
..
info	[ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION	2013-02-23 14:20:56 -05:00
acp_attachments.php	[ticket/11010] validation to match type	2013-05-20 18:42:02 +02:00
acp_ban.php
acp_bbcodes.php
acp_board.php	[ticket/11010] properly tabifying 'max_autologin_time'	2013-05-21 11:57:33 +02:00
acp_bots.php
acp_captcha.php
acp_database.php
acp_disallow.php
acp_email.php
acp_extensions.php	Merge remote-tracking branch 'EXreaction/ticket/11415' into develop	2013-05-18 11:20:47 -04:00
acp_forums.php
acp_groups.php	Merge branch 'develop-olympus' into develop	2013-05-26 19:19:08 +02:00
acp_icons.php
acp_inactive.php	[ticket/11454] Use set_addresses in other applicable areas	2013-04-24 15:34:12 -05:00
acp_jabber.php
acp_language.php
acp_logs.php
acp_main.php
acp_modules.php	[ticket/11465] Check if class exists before including info file	2013-04-14 17:25:45 +02:00
acp_permission_roles.php
acp_permissions.php
acp_php_info.php
acp_profile.php
acp_prune.php	Merge PR #1371 branch 'EXreaction/ticket/11236' into develop	2013-04-26 22:35:13 -04:00
acp_ranks.php
acp_reasons.php
acp_search.php
acp_send_statistics.php
acp_styles.php	[ticket/11310] Add hashes to action links to prevent CSRF attacks	2013-03-12 17:19:30 +01:00
acp_update.php	Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop	2013-05-20 11:55:33 -05:00
acp_users.php	[ticket/11454] Use set_addresses in other applicable areas	2013-04-24 15:34:12 -05:00
acp_words.php
auth.php