aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-06-16 14:29:18 +0200
committerAndreas Fischer <bantu@phpbb.com>2015-06-16 14:29:18 +0200
commite8769fd561edf011b6c3738600173e3c8bcbfdd9 (patch)
tree874bbee96918e5cfbcf7eb911b3abf654be9e3f9
parentefc09df8dfc8fff873dcc0ff55ac3c95e8e9f8c9 (diff)
parent41f78b5c498976dcd4bda350da833fae1a4d1ad5 (diff)
downloadforums-e8769fd561edf011b6c3738600173e3c8bcbfdd9.tar
forums-e8769fd561edf011b6c3738600173e3c8bcbfdd9.tar.gz
forums-e8769fd561edf011b6c3738600173e3c8bcbfdd9.tar.bz2
forums-e8769fd561edf011b6c3738600173e3c8bcbfdd9.tar.xz
forums-e8769fd561edf011b6c3738600173e3c8bcbfdd9.zip
Merge pull request #3695 from javiexin/ticket/13931
[ticket/13931] Wrong order in docs/events.md * javiexin/ticket/13931: [ticket/13931] Wrong order in docs/events.md Conflicts: phpBB/docs/events.md
-rw-r--r--phpBB/docs/events.md64
1 files changed, 32 insertions, 32 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 5350ebbc6b..46bd85a3bc 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -539,6 +539,38 @@ 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
+ + styles/subsilver2/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
+ + styles/subsilver2/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
+ + styles/subsilver2/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
+ + styles/subsilver2/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:
@@ -629,38 +661,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
- + styles/subsilver2/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
- + styles/subsilver2/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
- + styles/subsilver2/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
- + styles/subsilver2/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: