diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-06-16 14:32:01 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-06-16 14:32:01 +0200 |
| commit | 65fef50869a8b16635f24e324ce7820509ef4aa5 (patch) | |
| tree | 76b0b6ffcb8b45029eb10e6342fe9c0d57b50f98 /phpBB | |
| parent | 65d44923b42d93f28b407f7e7cb9041cf154490c (diff) | |
| parent | e8769fd561edf011b6c3738600173e3c8bcbfdd9 (diff) | |
| download | forums-65fef50869a8b16635f24e324ce7820509ef4aa5.tar forums-65fef50869a8b16635f24e324ce7820509ef4aa5.tar.gz forums-65fef50869a8b16635f24e324ce7820509ef4aa5.tar.bz2 forums-65fef50869a8b16635f24e324ce7820509ef4aa5.tar.xz forums-65fef50869a8b16635f24e324ce7820509ef4aa5.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13931] Wrong order in docs/events.md
Conflicts:
phpBB/docs/events.md
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/events.md | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 7836ae08f8..d15f86a6a3 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -508,6 +508,34 @@ mcp_post_additional_options * Since: 3.1.5-RC1 * Purpose: Add content within the list of post moderation actions +mcp_warn_post_add_warning_field_after +=== +* Locations: + + styles/prosilver/template/mcp_warn_post.html +* Since: 3.1.0-RC4 +* Purpose: Add content during warning for a post - after add warning field. + +mcp_warn_post_add_warning_field_before +=== +* Locations: + + styles/prosilver/template/mcp_warn_post.html +* Since: 3.1.0-RC4 +* Purpose: Add content during warning for a post - before add warning field. + +mcp_warn_user_add_warning_field_after +=== +* Locations: + + styles/prosilver/template/mcp_warn_user.html +* Since: 3.1.0-RC4 +* Purpose: Add content during warning a user - after add warning field. + +mcp_warn_user_add_warning_field_before +=== +* Locations: + + styles/prosilver/template/mcp_warn_user.html +* Since: 3.1.0-RC4 +* Purpose: Add content during warning a user - before add warning field. + memberlist_body_username_append === * Locations: @@ -587,34 +615,6 @@ memberlist_view_user_statistics_before * Since: 3.1.0-a1 * Purpose: Add entries before the user statistics part of any user profile -mcp_warn_post_add_warning_field_after -=== -* Locations: - + styles/prosilver/template/mcp_warn_post.html -* Since: 3.1.0-RC4 -* Purpose: Add content during warning for a post - after add warning field. - -mcp_warn_post_add_warning_field_before -=== -* Locations: - + styles/prosilver/template/mcp_warn_post.html -* Since: 3.1.0-RC4 -* Purpose: Add content during warning for a post - before add warning field. - -mcp_warn_user_add_warning_field_after -=== -* Locations: - + styles/prosilver/template/mcp_warn_user.html -* Since: 3.1.0-RC4 -* Purpose: Add content during warning a user - after add warning field. - -mcp_warn_user_add_warning_field_before -=== -* Locations: - + styles/prosilver/template/mcp_warn_user.html -* Since: 3.1.0-RC4 -* Purpose: Add content during warning a user - before add warning field. - navbar_header_logged_out_content === * Locations: |