Igor Wiedler d766ee3fe6 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
  [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
  [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
  [ticket/10446] DRY X-AntiAbuse header addition.

Conflicts:
	phpBB/includes/ucp/ucp_register.php

2011-11-20 18:45:56 +01:00

..

info

[feature/remove-imagesets] Changing admin control panel styles module

2011-09-03 18:57:16 +03:00

acp_attachments.php

[feature/attachment-management-no-reassignment] Handle privacy and some more.

2011-04-24 23:33:51 +08:00

acp_ban.php

Merge branch 'develop-olympus' into develop

2011-11-13 21:14:21 +01:00

acp_bbcodes.php

[ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.

2011-08-21 14:34:34 +02:00

acp_board.php

Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop

2011-10-20 20:46:48 -04:00

acp_bots.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_captcha.php

[feature/extension-manager] Allow extensions to define captcha plugins.

2011-09-29 15:42:47 +02:00

acp_database.php

Merge branch 'develop-olympus' into develop

2011-11-19 21:54:20 -05:00

acp_disallow.php

Merge branch 'develop-olympus' into develop

2011-03-23 23:21:36 +01:00

acp_email.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

acp_forums.php

Merge branch 'develop-olympus' into develop

2011-11-13 16:09:12 +01:00

acp_groups.php

[ticket/10410] Add option to display users in their first teampage group

2011-10-28 22:55:26 +02:00

acp_icons.php

Merge branch 'develop-olympus' into develop

2011-04-08 12:24:59 +02:00

acp_inactive.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

acp_jabber.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_language.php

Merge branch 'develop-olympus' into develop

2011-11-17 12:46:00 -05:00

acp_logs.php

Merge branch 'develop-olympus' into develop

2011-07-16 21:00:14 -04:00

acp_main.php

Merge branch 'develop-olympus' into develop

2011-11-15 16:46:23 +01:00

acp_modules.php

[feature/extension-manager] Rename default methods to core methods on finder.

2011-11-18 16:44:42 +01:00

acp_permission_roles.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_permissions.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_php_info.php

Merge branch 'develop-olympus' into develop

2011-07-30 18:55:32 -04:00

acp_profile.php

[ticket/8542] Display custom profile fields in private messages

2011-05-20 16:45:29 +02:00

acp_prune.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_ranks.php

Merge branch 'develop-olympus' into develop

2011-10-14 02:55:21 +02:00

acp_reasons.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

acp_search.php

[feature/extension-manager] Removing now unused acp_search code

2011-11-18 19:57:20 +01:00

acp_send_statistics.php

[task/whitelist-code-coverage] Load all of includes/ into code coverage report

2011-08-07 20:14:53 -04:00

acp_styles.php

[feature/remove-db-styles] Remove forgotten template variables.

2011-09-20 23:15:30 +01:00

acp_update.php

Merge branch 'develop-olympus' into develop

2011-10-14 02:49:15 +02:00

acp_users.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

acp_words.php

Merge branch 'develop-olympus' into develop

2011-01-07 15:58:10 +01:00

auth.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00