aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-02-18 17:35:03 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-02-18 17:35:03 +0100
commit21c6223eb37e17296a109137a519bf3d1d984981 (patch)
tree77eeb565cb91ba0cd472f942e4f361c919ed6555 /phpBB/docs
parentddc96a7d07900b6a41f1a0e86fa2eae70e9cff0a (diff)
parent60f60acea31bd5c531ab757bae10dfb741c1b6ad (diff)
downloadforums-21c6223eb37e17296a109137a519bf3d1d984981.tar
forums-21c6223eb37e17296a109137a519bf3d1d984981.tar.gz
forums-21c6223eb37e17296a109137a519bf3d1d984981.tar.bz2
forums-21c6223eb37e17296a109137a519bf3d1d984981.tar.xz
forums-21c6223eb37e17296a109137a519bf3d1d984981.zip
Merge branch '3.1.x'
Conflicts: phpBB/styles/subsilver2/template/ucp_profile_profile_info.html phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md28
1 files changed, 28 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index f01295f767..8762761304 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1126,6 +1126,34 @@ ucp_prefs_view_select_menu_append
* Purpose: Add options to the bottom of the drop-down lists block of the Edit
Display Options screen
+ucp_profile_profile_info_before
+===
+* Locations:
+ + styles/prosilver/template/ucp_profile_profile_info.html
+* Since: 3.1.4-RC1
+* Purpose: Add options in profile page fieldset - before jabber field.
+
+ucp_profile_profile_info_after
+===
+* Locations:
+ + styles/prosilver/template/ucp_profile_profile_info.html
+* Since: 3.1.4-RC1
+* Purpose: Add options in profile page fieldset - after custom profile fields.
+
+ucp_profile_register_details_before
+===
+* Locations:
+ + styles/prosilver/template/ucp_profile_reg_details.html
+* Since: 3.1.4-RC1
+* Purpose: Add options in profile page fieldset - before first field.
+
+ucp_profile_register_details_after
+===
+* Locations:
+ + styles/prosilver/template/ucp_profile_reg_details.html
+* Since: 3.1.4-RC1
+* Purpose: Add options in profile page fieldset - after confirm password field.
+
ucp_register_credentials_before
===
* Locations: