Merge branch 'master' into amyblais-patch-19

mattermost · Dec 13, 2024 · 41811b7 · 41811b7
2 parents 9e28edf + 14dd003
commit 41811b7
Show file tree

Hide file tree

Showing 24 changed files with 300 additions and 32 deletions.
diff --git a/source/configure/site-configuration-settings.rst b/source/configure/site-configuration-settings.rst
@@ -733,23 +733,23 @@ Enable last active time
 .. config:setting:: users-enablecustomusergroups
   :displayname: Enable custom user groups (Users and Teams)
   :systemconsole: Site Configuration > Users and Teams
-  :configjson: N/A
-  :environment: N/A
+  :configjson: ServiceSettings.EnableCustomGroups
+  :environment: MM_SERVICESETTINGS.ENABLECUSTOMGROUPS
 
   - **true**: **(Default)** Users with appropriate permissions can create custom user groups, and users can @mention custom user groups in Mattermost conversations.
-  - **false**: Users cannot set custom statuses.
+  - **false**: Custom user groups cannot be created.
 
 Enable custom user groups
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. include:: ../_static/badges/ent-pro-only.rst
   :start-after: :nosearch:
 
-+---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+
-| - **true**: **(Default)** Users with appropriate permissions can create custom user groups,       | - System Config path: **Site Configuration > Users and Teams**              |
-|   and users can @mention custom user groups in Mattermost conversations.                          | - ``config.json`` setting: N/A                                              |
-| - **false**: Users cannot set custom statuses.                                                    | - Environment variable: N/A                                                 |
-+---------------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------+
++---------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------+
+| - **true**: **(Default)** Users with appropriate permissions can create custom user groups,       | - System Config path: **Site Configuration > Users and Teams**                     |
+|   and users can @mention custom user groups in Mattermost conversations.                          | - ``config.json`` setting: ``ServiceSettings`` > ``EnableCustomGroups`` > ``true`` |
+| - **false**: Custom user groups cannot be created.                                                | - Environment variable: MM_SERVICESETTINGS.ENABLECUSTOMGROUPS                      |
++---------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------+
 
 .. config:setting:: users-userstatsupdatetime
   :displayname: User statistics update time (Users and Teams)

diff --git a/source/configure/user-management-configuration-settings.rst b/source/configure/user-management-configuration-settings.rst
diff --git a/source/images/add-members-to-a-channel.png b/source/images/add-members-to-a-channel.png
diff --git a/source/images/add-members-to-a-team.png b/source/images/add-members-to-a-team.png
diff --git a/source/images/allow-create-posts-for-a-channel.png b/source/images/allow-create-posts-for-a-channel.png
diff --git a/source/images/allow-manage-bookmarks-for-a-channel.png b/source/images/allow-manage-bookmarks-for-a-channel.png
diff --git a/source/images/allow-manage-members-for-a-channel.png b/source/images/allow-manage-members-for-a-channel.png
diff --git a/source/images/allow-mentions-for-a-channel.png b/source/images/allow-mentions-for-a-channel.png
diff --git a/source/images/allow-post-reactions-for-a-channel.png b/source/images/allow-post-reactions-for-a-channel.png
diff --git a/source/images/anyone-can-join-a-team.png b/source/images/anyone-can-join-a-team.png
diff --git a/source/images/archive-a-channel.png b/source/images/archive-a-channel.png
diff --git a/source/images/archive-a-team.png b/source/images/archive-a-team.png
diff --git a/source/images/channel-configuration-details.png b/source/images/channel-configuration-details.png
diff --git a/source/images/channel-search-filters.png b/source/images/channel-search-filters.png
diff --git a/source/images/find-channels.png b/source/images/find-channels.png
diff --git a/source/images/find-teams.png b/source/images/find-teams.png
diff --git a/source/images/remove-members-from-a-channel.png b/source/images/remove-members-from-a-channel.png
diff --git a/source/images/remove-members-from-a-team.png b/source/images/remove-members-from-a-team.png
diff --git a/source/images/set-a-channel-to-public-or-private.png b/source/images/set-a-channel-to-public-or-private.png
diff --git a/source/images/specific-email-domains-can-join-a-team.png b/source/images/specific-email-domains-can-join-a-team.png
diff --git a/source/images/sync-group-members-in-a-channel.png b/source/images/sync-group-members-in-a-channel.png
diff --git a/source/images/sync-group-members-in-a-team.png b/source/images/sync-group-members-in-a-team.png
diff --git a/source/images/team-configuration-details.png b/source/images/team-configuration-details.png
diff --git a/source/images/team-search-filters.png b/source/images/team-search-filters.png