diff --git a/templates/zerver/help/add-custom-emoji.md b/templates/zerver/help/add-custom-emoji.md index 6d1d4d4880..fcc4f36f14 100644 --- a/templates/zerver/help/add-custom-emoji.md +++ b/templates/zerver/help/add-custom-emoji.md @@ -4,7 +4,7 @@ By default, anyone other than guests can add custom emoji to a Zulip organizatio are available to all users. Organization administrators can also -[change who can add custom emoji](/help/only-allow-admins-to-add-emoji). +[change who can add custom emoji](/help/configure-who-can-add-custom-emoji). ## Add custom emoji @@ -57,4 +57,4 @@ administrators can delete anyone's custom emoji. ## Related articles -* [Change who can add custom emoji](/help/only-allow-admins-to-add-emoji) +* [Change who can add custom emoji](/help/configure-who-can-add-custom-emoji) diff --git a/templates/zerver/help/only-allow-admins-to-add-emoji.md b/templates/zerver/help/configure-who-can-add-custom-emoji.md similarity index 52% rename from templates/zerver/help/only-allow-admins-to-add-emoji.md rename to templates/zerver/help/configure-who-can-add-custom-emoji.md index ab3c9280d1..1c39d84d25 100644 --- a/templates/zerver/help/only-allow-admins-to-add-emoji.md +++ b/templates/zerver/help/configure-who-can-add-custom-emoji.md @@ -3,8 +3,13 @@ {!admin-only.md!} By default, anyone other than guests can [add custom emoji](/help/add-custom-emoji) to the -organization. However, you can change your organization's settings to only -allow administrators to add new emoji. +organization. However, you can restrict the permission to add custom emoji to other sets of +roles: + +* Organization administrators +* Organization administrators and moderators +* Organization administrators and all members +* Organization administrators and [full members](/help/restrict-permissions-of-new-members) ### Change who can add custom emoji diff --git a/templates/zerver/help/include/sidebar_index.md b/templates/zerver/help/include/sidebar_index.md index c38a263e4e..097445fa7a 100644 --- a/templates/zerver/help/include/sidebar_index.md +++ b/templates/zerver/help/include/sidebar_index.md @@ -130,7 +130,7 @@ * [Restrict user group management](/help/restrict-user-group-management) * [Restrict name and email changes](/help/restrict-name-and-email-changes) * [Restrict profile picture changes](/help/restrict-profile-picture-changes) -* [Change who can add custom emoji](/help/only-allow-admins-to-add-emoji) +* [Change who can add custom emoji](/help/configure-who-can-add-custom-emoji) * [Block image and link previews](/help/allow-image-link-previews) * [Disable message edit history](/help/disable-message-edit-history) * [Manage editing of old messages](/help/configure-message-editing-and-deletion) diff --git a/templates/zerver/help/moderating-open-organizations.md b/templates/zerver/help/moderating-open-organizations.md index c490290200..98c8af970f 100644 --- a/templates/zerver/help/moderating-open-organizations.md +++ b/templates/zerver/help/moderating-open-organizations.md @@ -14,7 +14,7 @@ problematic behavior: * Restrict who can [create streams](/help/configure-who-can-create-streams), [create bots](/help/restrict-bot-creation), [send private messages](/help/restrict-private-messages), or - [add custom emoji](/help/only-allow-admins-to-add-emoji). + [add custom emoji](/help/configure-who-can-add-custom-emoji). * Link to a code of conduct in your [organization description](/help/create-your-organization-profile) (displayed on the registration page). diff --git a/templates/zerver/help/restrict-permissions-of-new-members.md b/templates/zerver/help/restrict-permissions-of-new-members.md index ea910bb91a..65815db2d0 100644 --- a/templates/zerver/help/restrict-permissions-of-new-members.md +++ b/templates/zerver/help/restrict-permissions-of-new-members.md @@ -18,6 +18,7 @@ Currently, the following actions support limiting access to full members. - [Adding users to streams](/help/configure-who-can-invite-to-streams) - [Restricting posting to a stream](/help/stream-sending-policy) - [Restricting inviting users to organization](/help/invite-new-users) +- [Restricting adding custom emoji](/help/configure-who-can-add-custom-emoji) ### Set waiting period for new members diff --git a/templates/zerver/security.md b/templates/zerver/security.md index a1f52c128d..64c76f1a4f 100644 --- a/templates/zerver/security.md +++ b/templates/zerver/security.md @@ -53,7 +53,7 @@ priority. - Zulip also supports customizing whether non-admins can [create streams](/help/configure-who-can-create-streams), [invite to streams](/help/configure-who-can-invite-to-streams), - [add custom emoji](/help/only-allow-admins-to-add-emoji), + [add custom emoji](/help/configure-who-can-add-custom-emoji), [add integrations and bots](/help/restrict-bot-creation), [edit or delete messages](/help/configure-message-editing-and-deletion), and more. diff --git a/zerver/lib/test_helpers.py b/zerver/lib/test_helpers.py index 5a3fe66902..c5a1c5f5b8 100644 --- a/zerver/lib/test_helpers.py +++ b/zerver/lib/test_helpers.py @@ -469,6 +469,7 @@ def write_instrumentation_reports(full_suite: bool, include_webhooks: bool) -> N "help/community-topic-edits", "help/delete-a-stream", "for/working-groups-and-communities/", + "/help/only-allow-admins-to-add-emoji", "api/delete-stream", "casper/(?P.+)", "static/(?P.+)", diff --git a/zproject/urls.py b/zproject/urls.py index e746c0894c..9b3f1e70eb 100644 --- a/zproject/urls.py +++ b/zproject/urls.py @@ -768,6 +768,10 @@ urls += [ "help/community-topic-edits", RedirectView.as_view(url="/help/configure-who-can-edit-topics", permanent=True), ), + path( + "/help/only-allow-admins-to-add-emoji", + RedirectView.as_view(url="/help/configure-who-can-add-custom-emoji", permanent=True), + ), path("help/", help_documentation_view), path("help/", help_documentation_view), path("api/", api_documentation_view),