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

Merge branch '3.1.x' into 3.2.x

Browse source
This commit is contained in:
Marc Alexander 2016-12-18 20:50:38 +01:00
commit 60af11da9d
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/docs/events.md
View file

@ -2123,6 +2123,13 @@ ucp_profile_register_details_after
* Since: 3.1.4-RC1 * Since: 3.1.4-RC1
* Purpose: Add options in profile page fieldset - after confirm password field. * Purpose: Add options in profile page fieldset - after confirm password field.
ucp_register_buttons_before
===
* Locations:
+ styles/prosilver/template/ucp_register.html
* Since: 3.1.11-RC1
* Purpose: Add content before buttons in registration form.
ucp_register_credentials_before ucp_register_credentials_before
=== ===
* Locations: * Locations:

4
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -79,8 +79,6 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_COPPA --> <!-- IF S_COPPA -->
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">
@ -91,6 +89,8 @@
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT ucp_register_buttons_before -->
<div class="panel"> <div class="panel">
<div class="inner"> <div class="inner">