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

Conflicts:
	phpBB/install/database_update.php

2013-03-04 00:22:15 +01:00

..

info

[ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION

2013-02-23 14:20:56 -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

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

2013-03-04 00:22:15 +01:00

acp_bots.php

[ticket/10990] Changes for develop

2012-07-22 14:48:39 -05:00

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

[ticket/10990] Do not use comma separator when storing it as a log.

2012-07-22 14:39:10 -05:00

acp_extensions.php

[feature/migrations] Use getLocalisedMessage() function to get error message

2013-02-15 22:22:13 -06:00

acp_forums.php

[ticket/10758] Dependency inject parameters into cache_moderators.

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

acp_groups.php

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

2013-03-04 00:22:15 +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/11363] Fix to make get_module_infos get from all extensions

2013-03-01 12:05:08 -06: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

[feature/php-events] Remove event core.acp_profile_field_edit

2012-08-05 14:50:33 +02:00

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

[ticket/11011] pass $auth to search backend constructor

2012-08-08 11:07:47 +05:30

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] Remove trailing whitespace from avatar code

2013-02-19 12:30:14 +01:00

acp_words.php

…

auth.php

…