makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
* 3.1.x:
  [ticket/13931] Wrong order in docs/events.md

Conflicts:
	phpBB/docs/events.md
This commit is contained in:
Andreas Fischer 2015-06-16 14:32:01 +02:00
commit 65fef50869
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
phpBB/docs/events.md
View file

@ -508,6 +508,34 @@ mcp_post_additional_options
* Since: 3.1.5-RC1 * Since: 3.1.5-RC1
* Purpose: Add content within the list of post moderation actions * 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 memberlist_body_username_append
=== ===
* Locations: * Locations:
@ -587,34 +615,6 @@ memberlist_view_user_statistics_before
* Since: 3.1.0-a1 * Since: 3.1.0-a1
* Purpose: Add entries before the user statistics part of any user profile * 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 navbar_header_logged_out_content
=== ===
* Locations: * Locations: