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

..

acp_attachments.html

…

acp_avatar_options_gravatar.html

…

acp_avatar_options_local.html

…

acp_avatar_options_remote.html

…

acp_avatar_options_upload.html

…

acp_ban.html

…

acp_bbcodes.html

…

acp_board.html

…

acp_bots.html

…

acp_captcha.html

…

acp_database.html

…

acp_disallow.html

…

acp_email.html

…

acp_ext_details.html

…

acp_ext_disable.html

…

acp_ext_enable.html

…

acp_ext_list.html

…

acp_ext_purge.html

…

acp_forums_copy_perm.html

…

acp_forums.html

[feature/events] Remove extraneous space

2012-12-17 18:16:39 -05:00

acp_groups_position.html

…

acp_groups.html

…

acp_icons.html

…

acp_inactive.html

…

acp_jabber.html

…

acp_language.html

…

acp_logs.html

…

acp_main.html

[feature/events] Fix names of events in adm/style/acp_main.html

2012-12-17 11:37:38 -05:00

acp_modules.html

…

acp_permission_roles.html

…

acp_permissions.html

…

acp_php_info.html

…

acp_profile.html

…

acp_prune_forums.html

…

acp_prune_users.html

…

acp_ranks.html

…

acp_reasons.html

…

acp_search.html

…

acp_send_statistics.html

…

acp_styles.html

…

acp_update.html

…

acp_users_avatar.html

…

acp_users_feedback.html

…

acp_users_overview.html

[feature/events] Append "_append" to acp_users_overview_options

2012-12-17 11:37:39 -05:00

acp_users_prefs.html

…

acp_users_profile.html

…

acp_users_signature.html

…

acp_users_warnings.html

…

acp_users.html

…

acp_words.html

…

admin.css

…

ajax.js

…

avatars.js

…

captcha_default_acp_demo.html

…

captcha_gd_acp.html

…

captcha_qa_acp_demo.html

…

captcha_qa_acp.html

…

captcha_recaptcha_acp.html

…

captcha_recaptcha.html

…

colour_swatch.html

…

confirm_bbcode.html

…

confirm_body_prune.html

…

confirm_body.html

…

custom_profile_fields.html

…

editor.js

…

install_convert.html

…

install_error.html

…

install_footer.html

…

install_header.html

…

install_install.html

…

install_main.html

…

install_update_diff.html

…

install_update.html

…

message_body.html

…

overall_footer.html

[feature/events] Change _end suffix to _after in acp_overall_footer_end

2012-12-17 11:37:41 -05:00

overall_header.html

[feature/events] Append "_append" to acp_overall_header_head

2012-12-17 11:37:42 -05:00

pagination.html

…

permission_forum_copy.html

…

permission_mask.html

…

permission_roles_mask.html

…

permission_trace.html

…

permissions.js

…

progress_bar.html

…

simple_body.html

…

simple_footer.html

[feature/events] acp_simple_footer_end -> acp_simple_footer_after

2012-12-17 11:37:43 -05:00

simple_header.html

[feature/events] Append "_append" to acp_simple_header_head

2012-12-17 11:37:44 -05:00

timezone_option.html

…

timezone.js

…

tooltip.js

…

viewsource.html

…