1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.1.x'

This commit is contained in:
Marc Alexander
2015-11-10 17:40:41 +01:00
12 changed files with 270 additions and 14 deletions

View File

@@ -1,3 +1,15 @@
acp_ban_cell_append
===
* Location: adm/style/acp_ban.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the ban cell area
acp_ban_cell_prepend
===
* Location: adm/style/acp_ban.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the ban cell area
acp_bbcodes_actions_append
===
* Location: adm/style/acp_bbcodes.html
@@ -16,6 +28,30 @@ acp_bbcodes_edit_fieldsets_after
* Since: 3.1.0-a3
* Purpose: Add settings to BBCode add/edit form
acp_email_group_options_append
===
* Location: adm/style/acp_email.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the group options select box
acp_email_group_options_prepend
===
* Location: adm/style/acp_email.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the group options select box
acp_email_find_username_append
===
* Location: adm/style/acp_email.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the fimd username link
acp_email_find_username_prepend
===
* Location: adm/style/acp_email.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the fimd username link
acp_email_options_after
===
* Location: adm/style/acp_email.html
@@ -64,6 +100,18 @@ acp_forums_prune_settings_prepend
* Since: 3.1.2-RC1
* Purpose: Add settings to forums before prune settings section
acp_forums_quick_select_button_append
===
* Location: adm/style/acp_forums.html
* Since: 3.1.7-RC1
* Purpose: Add content after the quick select forum submit button
acp_forums_quick_select_button_prepend
===
* Location: adm/style/acp_forums.html
* Since: 3.1.7-RC1
* Purpose: Add content before the quick select forum submit button
acp_forums_rules_settings_append
===
* Location: adm/style/acp_forums.html
@@ -88,6 +136,66 @@ acp_group_options_after
* Since: 3.1.0-b4
* Purpose: Add addtional options to group settings (after GROUP_RECEIVE_PM)
acp_groups_find_username_append
===
* Location: adm/style/acp_groups.html
* Since: 3.1.7-RC1
* Purpose: Add content at the end of the find username link
acp_groups_find_username_prepend
===
* Location: adm/style/acp_groups.html
* Since: 3.1.7-RC1
* Purpose: Add content at the start of the find username link
acp_groups_manage_after
===
* Location: adm/style/acp_groups.html
* Since: 3.1.7-RC1
* Purpose: Add content after the manage groups table
acp_groups_manage_before
===
* Location: adm/style/acp_groups.html
* Since: 3.1.7-RC1
* Purpose: Add content before the manage groups table
acp_groups_position_legend_add_button_after
===
* Location: adm/style/acp_groups_position.html
* Since: 3.1.7-RC1
* Purpose: Add content after adding group to legend submit button
acp_groups_position_legend_add_button_before
===
* Location: adm/style/acp_groups_position.html
* Since: 3.1.7-RC1
* Purpose: Add content before adding group to legend submit button
acp_groups_position_teampage_add_button_after
===
* Location: adm/style/acp_groups_position.html
* Since: 3.1.7-RC1
* Purpose: Add content after adding group to teampage submit button
acp_groups_position_teampage_add_button_before
===
* Location: adm/style/acp_groups_position.html
* Since: 3.1.7-RC1
* Purpose: Add content before adding group to teampage submit button
acp_logs_quick_select_forum_button_append
===
* Location: adm/style/acp_logs.html
* Since: 3.1.7-RC1
* Purpose: Add content after the quick forum select form submit button
acp_logs_quick_select_forum_button_prepend
===
* Location: adm/style/acp_logs.html
* Since: 3.1.7-RC1
* Purpose: Add content before the quick forum select form submit button
acp_main_actions_append
===
* Location: adm/style/acp_main.html
@@ -125,6 +233,102 @@ acp_overall_header_stylesheets_after
* Purpose: Add assets after stylesheets within the `<head>` tags in the ACP.
Note that INCLUDECSS will not work with this event.
acp_permission_forum_copy_src_forum_append
===
* Location: adm/style/permission_forum_copy.html
* Since: 3.1.7-RC1
* Purpose: Add content after the sourse forum select form
acp_permission_forum_copy_src_forum_prepend
===
* Location: adm/style/permission_forum_copy.html
* Since: 3.1.7-RC1
* Purpose: Add content before the sourse forum select form
acp_permission_forum_copy_dest_forum_append
===
* Location: adm/style/permission_forum_copy.html
* Since: 3.1.7-RC1
* Purpose: Add content after the destiny forum select form
acp_permission_forum_copy_dest_forum_prepend
===
* Location: adm/style/permission_forum_copy.html
* Since: 3.1.7-RC1
* Purpose: Add content before the destiny forum select form
acp_permissions_add_group_options_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the group multiple select form
acp_permissions_add_group_options_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the group multiple select form
acp_permissions_find_username_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the find username link
acp_permissions_find_username_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the find username link
acp_permissions_select_forum_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the forum select form label
acp_permissions_select_forum_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the forum select form label
acp_permissions_select_group_after
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the group select form in usergroup view
acp_permissions_select_group_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the group select form label
acp_permissions_select_group_before
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the group select form in usergroup view
acp_permissions_select_group_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the group select form label
acp_permissions_select_multiple_forum_append
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content after the forum multiple select form label
acp_permissions_select_multiple_forum_prepend
===
* Location: adm/style/acp_permissions.html
* Since: 3.1.7-RC1
* Purpose: Add content before the forum multiple select form label
acp_posting_buttons_after
===
* Locations:
@@ -146,6 +350,34 @@ acp_profile_contact_before
* Since: 3.1.6-RC1
* Purpose: Add extra options to custom profile field configuration in the ACP
acp_prune_forums_append
===
* Locations:
+ adm/style/acp_prune_forums.html
* Since: 3.1.7-RC1
* Purpose: Add content after the forum select form label
acp_prune_forums_prepend
===
* Locations:
+ adm/style/acp_prune_forums.html
* Since: 3.1.7-RC1
* Purpose: Add content before the forum select form label
acp_prune_users_find_username_append
===
* Locations:
+ adm/style/acp_prune_users.html
* Since: 3.1.7-RC1
* Purpose: Add content after the find username link
acp_prune_users_find_username_prepend
===
* Locations:
+ adm/style/acp_prune_users.html
* Since: 3.1.7-RC1
* Purpose: Add content before the find username link
acp_ranks_edit_after
===
* Locations:
@@ -297,6 +529,18 @@ acp_users_prefs_view_prepend
* Since: 3.1.0-b3
* Purpose: Add user options fieldset to the top of ACP users view prefs settings
acp_users_select_group_after
===
* Location: adm/style/acp_users.html
* Since: 3.1.7-RC1
* Purpose: Add content after group select form
acp_users_select_group_before
===
* Location: adm/style/acp_users.html
* Since: 3.1.7-RC1
* Purpose: Add content before group select form
attachment_file_after
===
* Locations: