diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 19:42:28 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-21 19:42:28 +0100 |
| commit | 462664b4b43b094a9e569b7514b84ab90b4095ef (patch) | |
| tree | f6c21f1f39dc1ebb493000407c254db6b4931641 | |
| parent | 2ba391d04a1d0031ce8255d74e50b1a59ee04dd0 (diff) | |
| parent | 7bc19179089a3aebb55dcd2021ed590c7afaa045 (diff) | |
| download | forums-462664b4b43b094a9e569b7514b84ab90b4095ef.tar forums-462664b4b43b094a9e569b7514b84ab90b4095ef.tar.gz forums-462664b4b43b094a9e569b7514b84ab90b4095ef.tar.bz2 forums-462664b4b43b094a9e569b7514b84ab90b4095ef.tar.xz forums-462664b4b43b094a9e569b7514b84ab90b4095ef.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/adm/style/acp_email.html | 2 | ||||
| -rw-r--r-- | phpBB/docs/events.md | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 950ecb40b0..63acd7fcc1 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -47,6 +47,8 @@ <dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd> </dl> +<!-- EVENT acp_email_options_after --> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_EMAIL}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 436a99d478..311f3199f6 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -16,6 +16,12 @@ acp_bbcodes_edit_fieldsets_after * Since: 3.1.0-a3 * Purpose: Add settings to BBCode add/edit form +acp_email_options_after +=== +* Location: adm/style/acp_email.html +* Since: 3.1.2-RC1 +* Purpose: Add settings to mass email form + acp_forums_normal_settings_append === * Location: adm/style/acp_forums.html |