Skip to content

Commit

Permalink
login screenshot updates & link fix (#7351)
Browse files Browse the repository at this point in the history
  • Loading branch information
cwarnermm authored Sep 5, 2024
1 parent a7f842c commit a61752f
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions source/collaborate/access-your-workspace.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Email address or username

When :ref:`account creation with email <configure/authentication-configuration-settings:enable account creation with email>` is enabled by your system admin, you can log in with the username or email address used to create a Mattermost account.

.. image:: ../images/sign-in_with_email.png
.. image:: ../images/login-email-username.png
:alt: Log in to Mattermost with your username or email address, or reset your password.

Single Sign-On (SSO)
Expand All @@ -77,14 +77,14 @@ When enabled by your system admin, you may log in using your GitLab, Google, Ent

When enabled by your system admin, you can log in with your GitLab account using a one-click login option.

.. image:: ../images/sign-in-gitlab.png
.. image:: ../images/login-gitlab.png
:alt: Log in to Mattermost using your GitLab credentials.

.. tab:: Google

When enabled by your system admin, you can log in with your Google account using a one-click login option.

.. image:: ../images/sign-in-google-apps.png
.. image:: ../images/login-google.png
:alt: Log in to Mattermost using your Google Apps credentials.

.. tab:: Entra ID
Expand All @@ -99,7 +99,7 @@ When enabled by your system admin, you may log in using your GitLab, Google, Ent

When enabled by your system admin, you can log in with your AD/LDAP credentials. This lets you use the same username and password for Mattermost that you use for various other company services.

.. image:: ../images/sign-in_with_ldap.png
.. image:: ../images/login-ad.png
:alt: Log in to Mattermost with your AD/LDAP credentials.

.. tab:: SAML
Expand All @@ -108,8 +108,8 @@ When enabled by your system admin, you may log in using your GitLab, Google, Ent

Mattermost officially supports :doc:`Okta </onboard/sso-saml-okta>`, :doc:`OneLogin </onboard/sso-saml-onelogin>`, and Microsoft ADFS as an identity provider (IDP) for SAML, but you may use other SAML IDPs as well. See our :doc:`SAML Single Sign-On documentation </onboard/sso-saml>` to learn more about configuring SAML for Mattermost.

.. image:: ../images/sign-in_with_saml.png
:alt: Log in to Mattermost with your SAML credentials.
.. image:: ../images/login-onelogin.png
:alt: Log in to Mattermost with SAML credentials, such as OneLogin.

Multi-factor authentication
---------------------------
Expand Down
Binary file added source/images/login-ad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/login-email-username.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/login-gitlab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/login-google.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/login-office365.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/images/login-onelogin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion source/install/prepare-mattermost-database.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ To set up a PostgreSQL database for use by the Mattermost server:
6. Exit the PostgreSQL interactive terminal by running:

.. code-block:: SQL
.. code-block:: text
\q
Expand Down

0 comments on commit a61752f

Please sign in to comment.