Skip to content

Commit

Permalink
Fixes #691 - Added 2FA permission
Browse files Browse the repository at this point in the history
  • Loading branch information
ralf401 authored Nov 6, 2024
1 parent ee8a1c3 commit e633a9b
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 35 deletions.
Binary file modified images/manage/roles/permissions-user-preferences.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 58 additions & 33 deletions locale/admin-docs.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad Admin Documentation pre-release\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-31 12:20+0100\n"
"POT-Creation-Date: 2024-11-06 10:31+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -974,7 +974,7 @@ msgstr ""
#: ../manage/macros/learn-by-example.rst:0
#: ../manage/roles/admin-permissions.rst:40
#: ../manage/roles/agent-permissions.rst:31
#: ../manage/roles/user-preferences-permissions.rst:36
#: ../manage/roles/user-preferences-permissions.rst:37
#: ../manage/scheduler.rst:108
#: ../manage/webhook/add.rst:116
#: ../system/integrations/cti/includes/inbound-calls.include.rst:15
Expand Down Expand Up @@ -7194,13 +7194,13 @@ msgstr ""

#: ../manage/roles/admin-permissions.rst:38
#: ../manage/roles/agent-permissions.rst:29
#: ../manage/roles/user-preferences-permissions.rst:34
#: ../manage/roles/user-preferences-permissions.rst:35
msgid "Permission name"
msgstr ""

#: ../manage/roles/admin-permissions.rst:39
#: ../manage/roles/agent-permissions.rst:30
#: ../manage/roles/user-preferences-permissions.rst:35
#: ../manage/roles/user-preferences-permissions.rst:36
msgid "Give access to"
msgstr ""

Expand Down Expand Up @@ -7930,23 +7930,23 @@ msgstr ""
msgid "The permissions listed on this page all belong to the ``user_preferences`` namespace. You can select them individually, or you can just select ``user_preferences`` to enable the whole bunch."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:19
#: ../manage/roles/user-preferences-permissions.rst:20
msgid "User preferences permissions in the New Role dialog"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:19
#: ../manage/roles/user-preferences-permissions.rst:20
msgid "User preferences permissions are shown at the bottom of the New Role dialog..."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:27
#: ../manage/roles/user-preferences-permissions.rst:28
msgid "User profile page"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:27
#: ../manage/roles/user-preferences-permissions.rst:28
msgid "...and give users access to the pages of their :user-docs:`User Profile </extras/profile-and-settings.html>`."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:37
#: ../manage/roles/user-preferences-permissions.rst:38
msgid "``user_preferences.access_token``"
msgstr ""

Expand All @@ -7966,31 +7966,31 @@ msgstr ""
msgid "than the user that generated them."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:42
#: ../manage/roles/user-preferences-permissions.rst:43
msgid "``user_preferences.avatar``"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:43
#: ../manage/roles/user-preferences-permissions.rst:44
msgid "Avatar settings"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:44
#: ../manage/roles/user-preferences-permissions.rst:45
msgid "Override the default Gravatar with a custom avatar"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:45
#: ../manage/roles/user-preferences-permissions.rst:46
msgid "``user_preferences.calendar``"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:46
#: ../manage/roles/user-preferences-permissions.rst:47
msgid "Configure the calendar feed"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:48
#: ../manage/roles/user-preferences-permissions.rst:49
msgid "``user_preferences.device``"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:49
#: ../manage/roles/user-preferences-permissions.rst:50
msgid "Manage device login sessions"
msgstr ""

Expand All @@ -8006,19 +8006,19 @@ msgstr ""
msgid "To learn more, see :doc:`/manage/trigger/system-notifications`."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:53
#: ../manage/roles/user-preferences-permissions.rst:54
msgid "``user_preferences.language``"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:54
#: ../manage/roles/user-preferences-permissions.rst:55
msgid "Configure the UI locale/language"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:56
#: ../manage/roles/user-preferences-permissions.rst:57
msgid "``user_preferences.linked_accounts``"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:57
#: ../manage/roles/user-preferences-permissions.rst:58
msgid "Account linking"
msgstr ""

Expand All @@ -8038,12 +8038,18 @@ msgstr ""
msgid "is the only way users can utilize third-party logins."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:62
#: ../manage/roles/user-preferences-permissions.rst:63
msgid "``user_preferences.notifications``"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:63
msgid "Configuration of ticket notifications"
#: ../manage/roles/user-preferences-permissions.rst:0
msgid "Configuration of ticket"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:0
#: ../settings/branding.rst:27
#: ../settings/branding.rst:39
msgid "notifications"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:0
Expand All @@ -8058,7 +8064,7 @@ msgstr ""
msgid "Customers can't receive ticket notifications at all."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:67
#: ../manage/roles/user-preferences-permissions.rst:69
msgid "``user_preferences.out_of_office``"
msgstr ""

Expand All @@ -8082,7 +8088,7 @@ msgstr ""
msgid "they're replacing."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:73
#: ../manage/roles/user-preferences-permissions.rst:75
msgid "``user_preferences.overview_sorting``"
msgstr ""

Expand Down Expand Up @@ -8110,11 +8116,11 @@ msgstr ""
msgid "overviews has no effect on custom orders."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:80
#: ../manage/roles/user-preferences-permissions.rst:82
msgid "``user_preferences.password``"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:81
#: ../manage/roles/user-preferences-permissions.rst:83
msgid "Change account password"
msgstr ""

Expand All @@ -8123,7 +8129,31 @@ msgid "Make sure to **revoke this permission** for all your users"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:0
msgid "when using a third-party identity server (like LDAP)."
msgid "when using a third-party identity server (like LDAP) as"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:0
msgid "your only allowed authentication method."
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:87
msgid "``user_preferences.two_factor_authentication``"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:0
msgid "Allow users to setup and configure"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:0
msgid "their two factor authentication"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:0
msgid ":doc:`Two factor authentication </settings/security/two-factor>` has to be enabled"
msgstr ""

#: ../manage/roles/user-preferences-permissions.rst:0
msgid "that users can setup and configure it."
msgstr ""

#: ../manage/scheduler.rst:2
Expand Down Expand Up @@ -12410,11 +12440,6 @@ msgstr ""
msgid "CSV output (reporting, time accounting)"
msgstr ""

#: ../settings/branding.rst:27
#: ../settings/branding.rst:39
msgid "notifications"
msgstr ""

#: ../settings/branding.rst:30
msgid "Define the timezone of your Zammad installation."
msgstr ""
Expand Down
13 changes: 11 additions & 2 deletions manage/roles/user-preferences-permissions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ User Preferences Permissions
.. figure:: /images/manage/roles/permissions-user-preferences.png
:alt: User preferences permissions in the New Role dialog
:align: center
:scale: 60%

User preferences permissions are shown at the bottom of the
New Role dialog...
Expand Down Expand Up @@ -60,7 +61,8 @@ User Preferences Permissions
| Note: If :ref:`automatic account linking <automatic-account-linking>` fails, this
| is the only way users can utilize third-party logins.
* - ``user_preferences.notifications``
- Configuration of ticket notifications
- | Configuration of ticket
| notifications
- | Agents only receive ticket notifications for
| :doc:`groups they have “full” access to </manage/groups/access-levels>`.
| Customers can't receive ticket notifications at all.
Expand All @@ -80,4 +82,11 @@ User Preferences Permissions
* - ``user_preferences.password``
- Change account password
- | Make sure to **revoke this permission** for all your users
| when using a third-party identity server (like LDAP).
| when using a third-party identity server (like LDAP) as
| your only allowed authentication method.
* - ``user_preferences.two_factor_authentication``
- | Allow users to setup and configure
| their two factor authentication
- | :doc:`Two factor authentication </settings/security/two-factor>` has to be enabled
| that users can setup and configure it.

0 comments on commit e633a9b

Please sign in to comment.