Skip to content

Commit

Permalink
Merge branch 'master' into resolve-mattermost#3872
Browse files Browse the repository at this point in the history
  • Loading branch information
cwarnermm authored Nov 12, 2024
2 parents 675d260 + dc65a2e commit 96fa99d
Show file tree
Hide file tree
Showing 164 changed files with 54 additions and 5 deletions.
6 changes: 5 additions & 1 deletion source/collaborate/mark-messages-unread.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ If you read a message, but don't have time to address it right away, you can mar

.. tab:: Mobile

Long press a message, and then tap **Mark as Unread**.
Long press a message, and then tap **Mark as Unread**.

.. image:: ../images/mobile-mark-a-message-as-unread.gif
:alt: Tap and hold on a message to access the available options.
:scale: 50
4 changes: 4 additions & 0 deletions source/collaborate/react-with-emojis-gifs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ Include emojis and GIFs in messages

Long press on a message, and then select a recently used emoji, or select the |smile-icon| to add a different reaction. Mattermost accesses the emojis and GIFs available on your mobile device.

.. image:: ../images/mobile-include-emojis-for-a-message-reaction.gif
:alt: Tap and hold on a message to access the recent emojis or even choose other ones.
:scale: 50

Manage emojis
-------------

Expand Down
24 changes: 24 additions & 0 deletions source/collaborate/share-files-in-messages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,36 @@ With file attachments, you can share additional information that helps your team

You can share files with other Mattermost users or entire channels by tapping the **Attachment** |attachments-icon| icon under the message input box when composing a message.

.. image:: ../images/mobile-attach-a-file-to-send-in-a-channel.gif
:alt: Tap on attachment icon to attach a file and send it in the channel.
:scale: 50

**Access files**

1. Tap the channel name at the top of the screen.

.. image:: ../images/mobile-channel-name-click.jpg
:alt: Click on the channel name to explore available options.
:scale: 30

2. Tap **Files**.

.. image:: ../images/mobile-edit-channel.jpg
:alt: Tap on Files to explore the available file attachments in the channel.
:scale: 30

3. Tap a file to download it, open it, or copy a public link to the file.

.. image:: ../images/mobile-tap-a-file-name-to-download.jpg
:alt: Tap on a file to download and open it.
:scale: 30

Or you can also click on |more-icon| to download the file or open it in the channel.

.. image:: ../images/mobile-more-options-to-download-or-view-a-file.jpg
:alt: You can also use more options to download ot view the file in the channel.
:scale: 30

Attachment limits and sizes
---------------------------

Expand Down
4 changes: 4 additions & 0 deletions source/collaborate/share-links.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ Share message links

Long press a message, and then tap **Copy Link** to copy the link to the clipboard. Long press to paste the link as a message or reply. Sharing links to messages generates a preview of the message.

.. image:: ../images/mobile-copy-a-link-to-the-message.gif
:alt: Tap and hold on a message to access the available options.
:scale: 50

.. note::

- Message previews respect channel membership permissions, so they’re only visible to users who have access to the original message. If the link is to a message in a public channel, any member of the team can see the message preview. If the link is to a message in a private channel or direct message, only members in that channel can see the message preview.
Expand Down
3 changes: 2 additions & 1 deletion source/deploy/mobile-testing-notifications.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ Then use the following instructions to confirm push notifications are working pr

A. Go to the notification settings menu in the mobile app.

.. image:: ../images/mobile_notification_settings.png
.. image:: ../images/mobile_notification_settings.gif
:alt: Access notification settings by selecting your profile picture to access Settings > Notifications.
:width: 300 px

B. Check that the mobile push notifications are set to send.

Expand Down
Binary file modified source/images/Channels_Hero.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 modified source/images/DiscordDarkTheme.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 modified source/images/GitHub.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 modified source/images/Global-Drafts-Animated-GIF.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/images/Group_filter.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 modified source/images/Groups_listing.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 modified source/images/GruvboxDark.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 modified source/images/Guest_Badges.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 modified source/images/Mattermost.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 modified source/images/MattermostDark.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 modified source/images/Monokai.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 modified source/images/NightOwlDark.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 modified source/images/OneDark.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 modified source/images/Organization.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 modified source/images/SSO-SAML-ADFS_configure-saml_003.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 modified source/images/SSO-SAML-ADFS_configure-saml_004.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 modified source/images/SolarizedDark.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 modified source/images/WindowsDark.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 modified source/images/access-user-groups.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 modified source/images/activate-user.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 modified source/images/add-channels-button.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 modified source/images/add-ip-filter-range.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 modified source/images/add-member-to-channel.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 modified source/images/add-mfa-to-account.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 modified source/images/add-user-to-team.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 modified source/images/add_custom_emoji.png
Binary file modified source/images/adfs_22_mattermost_basics.png
Binary file modified source/images/adfs_23_mattermost_verification.png
Binary file modified source/images/adfs_24_mattermost_encryption.png
Binary file modified source/images/adfs_25_mattermost_attributes.png
Binary file modified source/images/adfs_26_mattermost_login_button.png
Binary file modified source/images/browse-channels.png
Binary file modified source/images/calendar2.png
Binary file modified source/images/channel-files-icon.png
Binary file modified source/images/channel-header.png
Binary file modified source/images/channel-heading-categories.png
Binary file modified source/images/channel-more.png
Binary file modified source/images/channel-notification-settings.gif
Binary file modified source/images/channel-purpose-info.png
Binary file modified source/images/channel-sidebar-navigation.gif
Binary file modified source/images/channel_sidebar_updates.gif
Binary file modified source/images/clear-custom-status.png
Binary file modified source/images/collapse-sidebar.png
Binary file modified source/images/convert-public-channel-to-private.png
Binary file modified source/images/copy-link.png
Binary file modified source/images/create-team.gif
Binary file modified source/images/crt-following-thread.jpg
Binary file modified source/images/crt-following-thread.png
Binary file modified source/images/crt-new-unread-threads.jpg
Binary file modified source/images/crt-thread-view.jpg
Binary file modified source/images/deactivate-user.png
Binary file modified source/images/delete_custom_emoji.png
Binary file modified source/images/desktop-app-settings.jpg
Binary file modified source/images/desktop-bookmark-add-choice.png
Binary file modified source/images/desktop-bookmark-add.png
Binary file modified source/images/desktop-edit-server.png
Binary file modified source/images/desktop-remove-server.png
Binary file modified source/images/desktop-server-add.png
Binary file modified source/images/desktop-system-permissions.png
Binary file modified source/images/desktop.png
Binary file modified source/images/dm-display.gif
Binary file modified source/images/edit-custom-group.png
Binary file modified source/images/edit-team-icon.png
Binary file modified source/images/edit-viewer-system-admin-role.png
Binary file modified source/images/emoji-skin-tone.png
Binary file modified source/images/emojiautocomplete.png
Binary file modified source/images/enable-disable-ip-filtering.gif
Binary file modified source/images/expand-sidebar.png
Binary file modified source/images/favorite-channel-desktop.png
Binary file modified source/images/favorites-list-sidebar.png
Binary file modified source/images/file-search-filter.png
Binary file modified source/images/find-users.png
Binary file modified source/images/focus.png
Binary file modified source/images/forward-message.png
Binary file modified source/images/join-channels.png
Binary file modified source/images/join-team.png
Binary file modified source/images/jump-to-message.png
Binary file modified source/images/keyboard-shortcuts.png
Binary file modified source/images/keycloak_5_mattermost_config.png
Binary file modified source/images/keycloak_6_mattermost_encryption.png
Binary file modified source/images/keycloak_7_mattermost_request_signing.png
Binary file modified source/images/keycloak_8_mattermost_attributes.png
Binary file modified source/images/leave-channels.png
Binary file modified source/images/message-more.png
Binary file modified source/images/message-navigation.gif
Binary file modified source/images/mobile-edit-channel.jpg
Binary file added source/images/mobile-mark-a-message-as-unread.gif
Binary file added source/images/mobile_notification_settings.gif
Binary file modified source/images/mobile_push_send_for.png
Binary file modified source/images/mobile_push_send_when.png
Binary file modified source/images/more-actions.png
Binary file modified source/images/multi-factor-authentication.png
Binary file modified source/images/navigation.gif
Binary file modified source/images/okta_10_mattermost_basics.png
Binary file modified source/images/okta_11_mattermost_verification.png
Binary file modified source/images/okta_12_mattermost_encryption.png
Binary file modified source/images/okta_13_mattermost_attributes.png
Binary file modified source/images/okta_14_mattermost_login_button.png
Binary file modified source/images/pinned-example-channel.png
Binary file modified source/images/pinned-example-rhs.png
Binary file modified source/images/pinned-posts.png
Binary file modified source/images/profile-log-out-mobile.png
Binary file modified source/images/profile-log-out.png
Binary file modified source/images/recent-emojis.png
Binary file modified source/images/recipe/prod-vuln-incident1.png
Binary file modified source/images/recipe/prod-vuln-incident10.png
Binary file modified source/images/recipe/prod-vuln-incident2.png
Binary file modified source/images/recipe/prod-vuln-incident3.png
Binary file modified source/images/recipe/prod-vuln-incident4.png
Binary file modified source/images/recipe/prod-vuln-incident5.png
Binary file modified source/images/recipe/prod-vuln-incident6.png
Binary file modified source/images/recipe/prod-vuln-incident7.png
Binary file modified source/images/recipe/prod-vuln-incident8.png
Binary file modified source/images/remove-member-from-channel.png
Binary file modified source/images/remove-user-from-team.png
Binary file modified source/images/restore-previous-edited-message.gif
Binary file modified source/images/restrict-role-access.png
Binary file modified source/images/saved-posts.png
Binary file modified source/images/search-files.png
Binary file modified source/images/search-messages.png
Binary file modified source/images/search-modifiers.png
Binary file modified source/images/set-your-availability-dnd.png
Binary file modified source/images/sort-categories.gif
Binary file added source/images/swipe-left-to-remove.gif
Binary file modified source/images/system-console-commercial-support.png
Binary file modified source/images/system-console-ip-filtering.png
Binary file modified source/images/system-scheme.png
Binary file modified source/images/team-scheme.png
Binary file modified source/images/team-settings.png
Binary file modified source/images/teams.gif
Binary file modified source/images/unreads.gif
Binary file modified source/images/user-email-update.png
Binary file modified source/images/user-id.png
Binary file modified source/images/user-profile-details.png
Binary file modified source/images/write-dm.png
4 changes: 4 additions & 0 deletions source/integrate/gitlab-interoperability.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ A Mattermost system admin must perform the following steps in Mattermost.

Install the GitLab integration from the in-product App Marketplace:

.. note::

We recommend making a copy of your webhook secret and encryption key, as it will only be visible to you once.

1. In Mattermost, from the Product menu |product-list|, select **App Marketplace**.
2. Search for or scroll to GitLab, and select **Install**.
3. Once installed, select **Configure**. You're taken to the System Console.
Expand Down
4 changes: 4 additions & 0 deletions source/integrate/servicenow-interoperability.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ A Mattermost system admin must perform the following steps in Mattermost.

Install the ServiceNow integration from the in-product App Marketplace:

.. note::

We recommend making a copy of your webhook and encryption secret, as it will only be visible to you once.

1. In Mattermost, from the Product menu |product-list|, select **App Marketplace**.
2. Search for or scroll to ServiceNow, and select **Install**.
3. Once installed, select **Configure**. You're taken to the System Console.
Expand Down
4 changes: 4 additions & 0 deletions source/integrate/zoom-interoperability.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ A Mattermost system admin must perform the following steps in Mattermost.

Install the Zoom integration from the in-product App Marketplace:

.. note::

We recommend making a copy of your webhook secret and encryption key, as it will only be visible to you once.

1. In Mattermost, from the Product menu |product-list|, select **App Marketplace**.
2. Search for or scroll to Zoom, and select **Install**.
3. Once installed, select **Configure**. You'll be taken to the System Console.
Expand Down
6 changes: 3 additions & 3 deletions source/preferences/connect-multiple-workspaces.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ Edit a server

Swipe left on an existing server entry to reveal additional options. Tap **Edit**.

.. image:: ../images/swipe-left-to-remove.png
:width: 400px
.. image:: ../images/swipe-left-to-remove.gif
:width: 300px
:alt: In the Mattermost mobile app, swipe left on an existing server connection entry to edit the connection.

Remove a server
Expand All @@ -92,7 +92,7 @@ Removing a server from your desktop app doesn't delete its data. You can add the

Swipe left on an existing server entry to reveal additional options. Tap **Remove**.

.. image:: ../images/swipe-left-to-remove.png
.. image:: ../images/swipe-left-to-remove.gif
:width: 400px
:alt: In the Mattermost mobile app, swipe left on an existing server connection entry to delete the connection.

Expand Down

0 comments on commit 96fa99d

Please sign in to comment.