1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
	phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
This commit is contained in:
Marc Alexander
2015-02-18 17:35:03 +01:00
3 changed files with 32 additions and 0 deletions

View File

@@ -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: