Marc Alexander 5d091e2d8f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/includes/ucp/ucp_groups.php

2013-01-04 10:49:57 +01:00

..

info

[ticket/11088] Move style, extension and language pack management to customise

2012-12-12 11:39:14 -05:00

acp_attachments.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

acp_ban.php

[ticket/11099] Mark acp_ban::display_ban_options() as static.

2012-10-30 18:43:00 -04:00

acp_bbcodes.php

…

acp_board.php

[feature/avatars] Fix behavior of avatar manager and variables

2012-12-04 15:12:04 +01:00

acp_bots.php

…

acp_captcha.php

[ticket/11157] get_captcha_types is an instance method.

2012-10-29 14:48:42 -04:00

acp_database.php

…

acp_disallow.php

…

acp_email.php

…

acp_extensions.php

[ticket/10631] Fix a spelling typo

2012-09-01 17:32:59 +02:00

acp_forums.php

[ticket/10758] Dependency inject parameters into cache_moderators.

2012-12-15 16:50:28 -05:00

acp_groups.php

[feature/avatars] Some more miscellaneous changes

2012-12-27 20:42:05 +01:00

acp_icons.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

acp_inactive.php

Merge remote-tracking branch 'upstream/develop' into feature/prune-users

2012-11-06 11:11:27 -05:00

acp_jabber.php

…

acp_language.php

[ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.

2012-09-08 14:42:38 +02:00

acp_logs.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

acp_main.php

[ticket/10758] Dependency inject parameters into cache_moderators.

2012-12-15 16:50:28 -05:00

acp_modules.php

[ticket/11305] Retrieve cache driver from container rather than cache service.

2013-01-02 01:29:32 -05:00

acp_permission_roles.php

…

acp_permissions.php

[ticket/10758] Extract obtain_user_data for the benefit of tests.

2012-12-19 21:50:35 -05:00

acp_php_info.php

…

acp_profile.php

…

acp_prune.php

Merge remote-tracking branch 'upstream/develop' into feature/prune-users

2012-11-06 11:11:27 -05:00

acp_ranks.php

[ticket/11259] htmlspecialchars($phpbb_admin_path)

2012-12-10 21:16:08 -06:00

acp_reasons.php

…

acp_search.php

…

acp_send_statistics.php

…

acp_styles.php

[ticket/10758] Dependency inject parameters into cache_moderators.

2012-12-15 16:50:28 -05:00

acp_update.php

…

acp_users.php

[feature/avatars] Some more miscellaneous changes

2012-12-27 20:42:05 +01:00

acp_words.php

…

auth.php

…