Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Move setting to allow message content in email notifications. 

We move "Allow message content in message notification emails" setting
from "Other settings" subsection to "Automated messages and emails"
subsection.

Fixes #25339.
This commit is contained in:
Sahil Batra 2023-05-02 22:43:41 +05:30 committed by Tim Abbott
parent 691f3c2d49
commit e3598c80ec
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
help/hide-message-content-in-emails.md
View File

@ -15,7 +15,7 @@ being sent through the email system.
{settings_tab|organization-settings} {settings_tab|organization-settings}
1. Under **Other settings**, toggle 1. Under **Automated messages and emails**, toggle
**Allow message content in message notification emails**. **Allow message content in message notification emails**.
{end_tabs} {end_tabs}

12
web/templates/settings/organization_settings_admin.hbs
View File

@ -30,6 +30,12 @@
label=admin_settings_label.realm_signup_notifications_stream label=admin_settings_label.realm_signup_notifications_stream
value_type="number" }} value_type="number" }}
{{> settings_checkbox
setting_name="realm_message_content_allowed_in_email_notifications"
prefix="id_"
is_checked=realm_message_content_allowed_in_email_notifications
label=admin_settings_label.realm_message_content_allowed_in_email_notifications}}
{{> settings_checkbox {{> settings_checkbox
setting_name="realm_send_welcome_emails" setting_name="realm_send_welcome_emails"
prefix="id_" prefix="id_"
@ -132,12 +138,6 @@
label=admin_settings_label.realm_default_code_block_language label=admin_settings_label.realm_default_code_block_language
value_type="string" }} value_type="string" }}
{{> settings_checkbox
setting_name="realm_message_content_allowed_in_email_notifications"
prefix="id_"
is_checked=realm_message_content_allowed_in_email_notifications
label=admin_settings_label.realm_message_content_allowed_in_email_notifications}}
{{> settings_checkbox {{> settings_checkbox
setting_name="realm_mandatory_topics" setting_name="realm_mandatory_topics"
prefix="id_" prefix="id_"