Merge branch 'master' into feature/7053-fix-search-special-chars

.github/workflows/preview-env-fork.yml

@@ -14,10 +14,61 @@ on:
         required: true
 
 jobs:
+  update-initial-status:
+    runs-on: ubuntu-latest
+    steps:
+    - name: package/update-initial-status
+      uses: mattermost/actions/delivery/update-commit-status@fec7b836001c9380d4bfaf28d443945c103a098c
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        repository_full_name: ${{ github.repository }}
+        commit_sha: ${{ inputs.COMMIT_SHA }}
+        context: "preview-env-fork-setup-update / deploy"
+        description: "Pipeline for docs generation for ${{ inputs.COMMIT_SHA }} is running"
+        status: pending
+
   deploy:
     uses: ./.github/workflows/preview-env-template.yml
     secrets: inherit
+    needs: 
+      - update-initial-status
     with:
       PR_NUMBER: ${{ inputs.PR_NUMBER }}
       TRIGGERING_ACTOR: ${{ inputs.TRIGGERING_ACTOR }}
       COMMIT_SHA: ${{ inputs.COMMIT_SHA }}
+
+  # We need to duplicate here in order to set the proper commit status
+  # https://mattermost.atlassian.net/browse/CLD-5815
+  update-failure-final-status:
+    runs-on: ubuntu-latest
+    if: failure() || cancelled()
+    needs:
+      - deploy
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@fec7b836001c9380d4bfaf28d443945c103a098c
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ inputs.COMMIT_SHA }}
+          context: "preview-env-fork-setup-update / deploy"
+          description: "Pipeline for docs generation for ${{ inputs.COMMIT_SHA }} failed~"
+          status: failure
+
+  # https://mattermost.atlassian.net/browse/CLD-5815
+  update-success-final-status:
+    runs-on: ubuntu-latest
+    if: success()
+    needs:
+      - deploy
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@fec7b836001c9380d4bfaf28d443945c103a098c
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ inputs.COMMIT_SHA }}
+          context: "preview-env-fork-setup-update / deploy"
+          description: "Pipeline for docs generation for ${{ inputs.COMMIT_SHA }} succeeded"
+          status: success

.github/workflows/preview-env-template.yml

@@ -17,13 +17,14 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           submodules: true
           fetch-depth: 0
+          ref: ${{ inputs.COMMIT_SHA }}
 
       - name: Setup Python
-        uses: actions/setup-python@db9987b4c1f10f0404fa60ee629f675fafbd6763 # v4.6.0
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
           python-version: "3.9"
 

source/_static/js/myscript-v1.js

@@ -68,7 +68,7 @@ $(document).ready(function () {
     // Fallback for when a notification CTA expires
     const dateInFuture = (value) =>
         new Date().getTime() <= new Date(value).getTime();
-    const expiryDate = '2024-11-10T00:00:00-0500';
+    const expiryDate = '2024-10-31T00:00:00-0500';
     // 12am EST
     const fallback_url =
         'https://mattermost.com/solutions/mattermost-for-microsoft-teams/';

source/_templates/custom-nav.html

@@ -4,7 +4,7 @@
             <span aria-hidden="true">×</span>
         </a>
 	    <div class="notification-bar__wrapper">
-		    <a href="https://mattermost.com/blog/microsoft-teams-m365-mission-critical-workflows/" target="_blank" class="notification-bar__link"><img src="{{ pathto('_static/images/notification-bar/icon-megaphone.svg', 1) }}" alt="">Mattermost v10.0 is now available! Learn what's new »</a>
+		    <a href="https://mattermost.com/hacktoberfest/" target="_blank" class="notification-bar__link"><img src="{{ pathto('_static/images/notification-bar/icon-megaphone.svg', 1) }}" alt="">Hacktoberfest is here! Contribute, collaborate & earn rewards.</a>
 		</div>
     </div>
 </div>

source/about/mattermost-v9-changelog.md

@@ -160,7 +160,7 @@ See [this walkthrough video](https://mattermost.com/video/mattermost-v9-10-chang
  - Pre-packaged Mattermost Copilot plugin version [v0.8.1](https://github.com/mattermost/mattermost-plugin-ai/releases/tag/v0.8.1).
  - Pre-packaged Calls plugin version [v0.28.2](https://github.com/mattermost/mattermost-plugin-calls/releases/tag/v0.28.2).
  - Re-designed the user profile popover and improved its performance.
- - Added banner to prompt users to give desktop notification permissions when opening the app.
+ - Added banner to prompt users to allow notification permissions when opening the app in web browsers.
  - Increased the width of the profile picture setting to match other user settings.
  - Improved screen reader support for the emoji picker.
  - Improved the accessibility of plugin buttons in the channel header.

source/collaborate/install-desktop-app.rst

@@ -164,7 +164,8 @@ The first time you log in to Mattermost using the desktop app, you'll see a spla
 
 .. tip::
 
-  Can't find your Mattermost server URL? Ask your company’s IT department or your Mattermost system admin for your organization’s **Mattermost Site URL**. It’ll look something like ``https://example.com/company/mattermost``, ``mattermost.yourcompanydomain.com``, or ``chat.yourcompanydomain.com``. These URLs could also end in ``.net``.
+ - Can't find your Mattermost server URL? Ask your company’s IT department or your Mattermost system admin for your organization’s **Mattermost Site URL**. It’ll look something like ``https://example.com/company/mattermost``, ``mattermost.yourcompanydomain.com``, or ``chat.yourcompanydomain.com``. These URLs could also end in ``.net``.
+ - Having trouble launching your Desktop App? See the `Troubleshooting section <#troubleshooting-your-desktop-app-installation>` for details.
 
 Additional documentation resources
 ----------------------------------
@@ -204,6 +205,11 @@ How do I download app diagnostics?
 
 From Mattermost desktop v5.3, you can download a diagnostics text file via **Help > Run diagnostics**, which can be attached to a Support ticket.
 
+Desktop App displays white screen while launching and doesn't load the page
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1. Delete the local ``Mattermost desktop app`` configuration file. See the `Where is configuration stored locally? <#where-is-configuration-stored-locally>`__ section above for file location details.
+2. Reinstall the application. 
+
 "Installation has failed" dialog
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

source/collaborate/message-priority.rst

@@ -42,7 +42,7 @@ To enable persistent notifications for a message:
 Receive persistent notifications
 --------------------------------
 
-You must have desktop and/or mobile push notifications enabled to receive persistent notifications. How you're notified depends on your :doc:`notifications preferences </preferences/manage-your-notifications>` for desktop and mobile push notifications. You won't be notified when your availability is set to **Do Not Disturb**, or if you're :ref:`Out of Office <preferences/set-your-status-availability:set your availability>`. Learn more about customizing how you receive notifications by visiting the :ref:`get notified <preferences/manage-your-notifications:get notified>` documentation.
+You must have desktop and/or mobile push notifications enabled to receive persistent notifications. How you're notified depends on your :doc:`notifications preferences </preferences/manage-your-notifications>` for desktop and mobile push notifications. You won't be notified when your availability is set to **Do Not Disturb**, or if you're :ref:`Out of Office <preferences/set-your-status-availability:set your availability>`. Learn more about managing and customizing how you receive :doc:`Mattermost notifications </preferences/manage-your-notifications>`.
 
 Urgent messages show a red mention badge which remains visibible until you view the message. Selecting the **Acknowledge** icon (when present) won't impact the urgent red mention badge.