aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-07-20 13:07:32 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-07-20 13:07:32 +0200
commit69c66db45936efb7c018b22170ca8fc34fbc567e (patch)
tree7357eb7301c987978611f2878b0d5100a2f2ae5f /phpBB/docs
parentcdaf4381acb2cd8d974b7102fc3bed8aebbbb57d (diff)
parent6b658874bb6d502acfc68e74ca2eca643acac579 (diff)
downloadforums-69c66db45936efb7c018b22170ca8fc34fbc567e.tar
forums-69c66db45936efb7c018b22170ca8fc34fbc567e.tar.gz
forums-69c66db45936efb7c018b22170ca8fc34fbc567e.tar.bz2
forums-69c66db45936efb7c018b22170ca8fc34fbc567e.tar.xz
forums-69c66db45936efb7c018b22170ca8fc34fbc567e.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/ucp_main_front.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index d15f86a6a3..e9a382c6e6 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1123,6 +1123,20 @@ ucp_agreement_terms_before
* Since: 3.1.0-b3
* Purpose: Add content before the terms of agreement text at user registration
+ucp_main_front_user_activity_after
+===
+* Locations:
+ + styles/prosilver/template/ucp_main_front.html
+* Since: 3.1.6-RC1
+* Purpose: Add content right after the user activity info viewing UCP front page
+
+ucp_main_front_user_activity_before
+===
+* Locations:
+ + styles/prosilver/template/ucp_main_front.html
+* Since: 3.1.6-RC1
+* Purpose: Add content right before the user activity info viewing UCP front page
+
ucp_pm_viewmessage_avatar_after
===
* Locations: