Merge branch 'master' into update_mscalendar_plugin_docs

Author: wiggin77

extensions/sitemap/__init__.py

@@ -195,10 +195,8 @@ def create_sitemap(app: Sphinx, exception):
 
         url = ElementTree.SubElement(root, "url")
         scheme = app.config.sitemap_url_scheme
-        if app.builder.config.language:
-            lang = app.builder.config.language + "/"
-        else:
-            lang = ""
+
+        lang = ""
 
         ElementTree.SubElement(url, "loc").text = site_url + scheme.format(
             lang=lang, version=version, link=link

source/_static/css/mattermost-global.css

@@ -2004,4 +2004,13 @@ mark {
 #check-your-mattermost-client-settings .tab-set .tab-set {
     background-color: var(--color-background-secondary);
     padding: 0rem 1rem 1rem 1rem;
+}
+
+/* Image borders */
+img {
+    border: 1px solid #d3d3d3;
+}
+
+body:not([data-custom-theme="light"]) img {
+    border: 1px solid #4a4a4a;
 }

source/about/editions-and-offerings.rst

@@ -48,7 +48,7 @@ Mattermost Enterprise Advanced
 Mattermost Enterprise Advanced is the :doc:`Intelligent Mission Environment </about/product>` for Cyber Defense and Mission Operations that features:
 
 - :doc:`Classified and Sensitive Information Controls </collaborate/display-channel-banners>`
-- :doc:`Zero Trust Security </manage/admin/zero-trust-security>` with dynamic attribute-based policy controls, environmental atributes, and User Authoritative Source integration
+- :doc:`Zero Trust Security </manage/admin/attribute-based-access-control>` with dynamic attribute-based policy controls, environmental atributes, and User Authoritative Source integration
 - :doc:`Mobile security </about/security/mobile-security>` controls
 - :doc:`Air-gapped deployment workflows </deploy/server/air-gapped-deployment>`
 

source/about/mattermost-mobile-releases.md

@@ -21,7 +21,7 @@ We strongly recommend using the latest mobile app release available that contain
 
 | **Release** | **Released on** | **Support ends** | **Compatible with** |
 |:---|:---|:---|:---|
-| v2.29 {ref}`FEATURE <release-v2-29-0>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.29.0) \| {ref}`Changelog <release-v2-29-0>` | 2025-06-16 | 2025-07-15 | {ref}`v10.9 <release-v10.9-feature-release>`, {ref}`v10.8 <release-v10.8-feature-release>`, {ref}`v10.7 <release-v10.7-feature-release>`, {ref}`v10.5 <release-v10.5-extended-support-release>` |
+| v2.29 {ref}`FEATURE <release-v2-29-1>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.29.1) \| {ref}`Changelog <release-v2-29-1>` | 2025-06-16 | 2025-07-15 | {ref}`v10.9 <release-v10.9-feature-release>`, {ref}`v10.8 <release-v10.8-feature-release>`, {ref}`v10.7 <release-v10.7-feature-release>`, {ref}`v10.5 <release-v10.5-extended-support-release>` |
 | v2.28 {ref}`FEATURE <release-v2-28-1>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.28.1) \| {ref}`Changelog <release-v2-28-1>` | 2025-05-16 | 2025-06-15 | {ref}`v10.8 <release-v10.8-feature-release>`, {ref}`v10.7 <release-v10.7-feature-release>`, {ref}`v10.6 <release-v10.6-feature-release>`, {ref}`v10.5 <release-v10.5-extended-support-release>` |
 | v2.27 {ref}`FEATURE <release-v2-27-1>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.27.1) \| {ref}`Changelog <release-v2-27-1>` | 2025-04-16 | 2025-05-15 | {ref}`v10.7 <release-v10.7-feature-release>`, {ref}`v10.6 <release-v10.6-feature-release>`, {ref}`v10.5 <release-v10.5-extended-support-release>`, {ref}`v9.11 <release-v9-11-extended-support-release>` |
 | v2.26 {ref}`FEATURE <release-v2-26-2>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.26.2) \| {ref}`Changelog <release-v2-26-2>` | 2025-03-16 | 2025-04-15 | {ref}`v10.6 <release-v10.6-feature-release>`, {ref}`v10.5 <release-v10.5-extended-support-release>`, {ref}`v10.4 <release-v10.4-feature-release>`, {ref}`v9.11 <release-v9-11-extended-support-release>` |

source/about/mattermost-server-releases.md

@@ -18,17 +18,17 @@ Mattermost releases a new server version on the 16th of each month in [binary fo
 
 | **Release** | **Released on** | **Support ends** |
 |:---|:---|:---|
-| v10.9 [Download](https://releases.mattermost.com/10.9.0/mattermost-10.9.0-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.9-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.9.0/sbom-mattermost-v10.9.0.json) | 2025-06-16 | 2025-09-15 |
-| v10.8 [Download](https://releases.mattermost.com/10.8.1/mattermost-10.8.1-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.8-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.8.1/sbom-mattermost-v10.8.1.json) | 2025-05-16 | 2025-08-15 |
-| v10.7 [Download](https://releases.mattermost.com/10.7.3/mattermost-10.7.3-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.7-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.7.3/sbom-mattermost-v10.7.3.json) | 2025-04-16 | 2025-07-15 |
+| v10.9 [Download](https://releases.mattermost.com/10.9.1/mattermost-10.9.1-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.9-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.9.1/sbom-mattermost-v10.9.1.json) | 2025-06-16 | 2025-09-15 |
+| v10.8 [Download](https://releases.mattermost.com/10.8.3/mattermost-10.8.3-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.8-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.8.3/sbom-mattermost-v10.8.3.json) | 2025-05-16 | 2025-08-15 |
+| v10.7 [Download](https://releases.mattermost.com/10.7.4/mattermost-10.7.4-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.7-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.7.4/sbom-mattermost-v10.7.4.json) | 2025-04-16 | 2025-07-15 |
 | v10.6 [Download](https://releases.mattermost.com/10.6.6/mattermost-10.6.6-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.6-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.6.6/sbom-mattermost-v10.6.6.json) | 2025-03-16 | 2025-06-15 |
-| v10.5 [Download](https://releases.mattermost.com/10.5.7/mattermost-10.5.7-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.5-extended-support-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.5.7/sbom-mattermost-v10.5.7.json) | 2025-02-16 | 2025-11-15 {ref}`EXTENDED <release-types>` |
+| v10.5 [Download](https://releases.mattermost.com/10.5.8/mattermost-10.5.8-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.5-extended-support-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.5.8/sbom-mattermost-v10.5.8.json) | 2025-02-16 | 2025-11-15 {ref}`EXTENDED <release-types>` |
 | v10.4 [Download](https://releases.mattermost.com/10.4.5/mattermost-10.4.5-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.4-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.4.5/sbom-mattermost-v10.4.5.json) | 2025-01-16 | 2025-04-15 |
 | v10.3 [Download](https://releases.mattermost.com/10.3.4/mattermost-10.3.4-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.3-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.3.4/sbom-mattermost-v10.3.4.json) | 2024-12-16 | 2025-03-15 |
 | v10.2 [Download](https://releases.mattermost.com/10.2.3/mattermost-10.2.3-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.2-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.2.3/sbom-mattermost-v10.2.3.json) | 2024-11-15 | 2025-02-15 |
 | v10.1 [Download](https://releases.mattermost.com/10.1.7/mattermost-10.1.7-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.1-feature-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.1.7/sbom-mattermost-v10.1.7.json) | 2024-10-16 | 2025-01-15 |
 | v10.0 [Download](https://releases.mattermost.com/10.0.4/mattermost-10.0.4-linux-amd64.tar.gz) \| {ref}`Changelog <release-v10.0-major-release>` \| [SBOM download](https://github.com/mattermost/mattermost/releases/download/v10.0.4/sbom.json) | 2024-09-16 | 2024-12-15 |
-| v9.11 [Download](https://releases.mattermost.com/9.11.16/mattermost-9.11.16-linux-amd64.tar.gz) \| {ref}`Changelog <release-v9-11-extended-support-release>` | 2024-08-16 | 2025-05-15 {ref}`EXTENDED <release-types>` |
+| v9.11 [Download](https://releases.mattermost.com/9.11.17/mattermost-9.11.17-linux-amd64.tar.gz) \| {ref}`Changelog <release-v9-11-extended-support-release>` | 2024-08-16 | 2025-05-15 {ref}`EXTENDED <release-types>` |
 | v9.10 [Download](https://releases.mattermost.com/9.10.3/mattermost-9.10.3-linux-amd64.tar.gz) \| {ref}`Changelog <release-v9-10-feature-release>` | 2024-07-16 | 2024-10-15 |
 | v9.9 [Download](https://releases.mattermost.com/9.9.3/mattermost-9.9.3-linux-amd64.tar.gz) \| {ref}`Changelog <release-v9-9-feature-release>` | 2024-06-14 | 2024-09-15 |
 | v9.8 [Download](https://releases.mattermost.com/9.8.3/mattermost-9.8.3-linux-amd64.tar.gz) \| {ref}`Changelog <release-v9-8-feature-release>` | 2024-05-16 | 2024-08-15 |

source/about/mattermost-v10-changelog.md

@@ -6,8 +6,11 @@
 (release-v10.9-feature-release)=
 ## Release v10.9 - [Feature Release](https://docs.mattermost.com/about/release-policy.html#release-types)
 
-- **10.9.1, release day TBD**
-  - Fixing an issue where Direct/Group Messages are sometimes missing on initial load [MM-64481](https://mattermost.atlassian.net/browse/MM-64481).
+- **10.9.1, released 2025-06-17**
+  - Mattermost v10.9.1 contains a medium severity level security fix. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release as soon as possible is highly recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+  - Fixed an issue where Direct/Group Messages were missing on initial load [MM-64481](https://mattermost.atlassian.net/browse/MM-64481).
+  - Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
+  - Mattermost v10.9.1 contains no database or functional changes.
 - **10.9.0, released 2025-06-16**
   - Original 10.9.0 release.
 
@@ -112,6 +115,17 @@ New setting options were added to ``config.json``. Below is a list of the additi
 (release-v10.8-feature-release)=
 ## Release v10.8 - [Feature Release](https://docs.mattermost.com/about/release-policy.html#release-types)
 
+- **10.8.3, released 2025-06-18**
+  - Mattermost v10.8.3 contains a medium severity level security fix. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release is recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+  - Pre-packaged Playbooks plugin [v1.41.1](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v1.41.1).
+  - Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
+  - Fixed an issue where the ``icon_emoji`` property was not working for webhook posts [MM-64316](https://mattermost.atlassian.net/browse/MM-64316).
+  - Added support for SSO while Mattermost is embedded in an iframe [MM-63900](https://mattermost.atlassian.net/browse/MM-63900).
+  - Mattermost v10.8.3 contains no database or functional changes.
+- **10.8.2, released 2025-05-29**
+  - Mattermost v10.8.2 contains high severity level security fixes. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release is recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+  - Pre-packaged MS Teams plugin [v2.2.1](https://github.com/mattermost/mattermost-plugin-msteams/releases/tag/v2.2.1).
+  - Mattermost v10.8.2 contains no database or functional changes.
 - **10.8.1, released 2025-05-21**
   - Mattermost v10.8.1 contains a Critical severity level security fix. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release as soon as possible is highly recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
   - Pre-packaged Playbooks plugin [v2.2.0](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v2.2.0).
@@ -196,6 +210,13 @@ New setting options were added to ``config.json``. Below is a list of the additi
 (release-v10.7-feature-release)=
 ## Release v10.7 - [Feature Release](https://docs.mattermost.com/about/release-policy.html#release-types)
 
+- **10.7.4, released 2025-06-18**
+  - Mattermost v10.7.4 contains high severity level security fixes. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release is recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+  - Pre-packaged MS Teams plugin [v2.2.1](https://github.com/mattermost/mattermost-plugin-msteams/releases/tag/v2.2.1).
+  - Pre-packaged Playbooks plugin [v1.41.1](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v1.41.1).
+  - Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
+  - Added support for SSO while Mattermost is embedded in an iframe [MM-63900](https://mattermost.atlassian.net/browse/MM-63900).
+  - Mattermost v10.7.4 contains no database or functional changes.
 - **10.7.3, released 2025-05-21**
   - Mattermost v10.7.3 contains a Critical severity level security fix. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release as soon as possible is highly recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
   - Pre-packaged Playbooks plugin [v2.2.0](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v2.2.0).
@@ -394,7 +415,14 @@ New setting options were added to ``config.json``. Below is a list of the additi
 (release-v10.5-extended-support-release)=
 ## Release v10.5 - [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#release-types)
 
+- **10.5.8, released 2025-06-18**
+  - Mattermost v10.5.8 contains a high severity level security fix. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release is recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+  - Fixed an issue where unreads from deleted teams would display in the titlebar/Desktop App [MM-63933](https://mattermost.atlassian.net/browse/MM-63933).
+  - Pre-packaged Playbooks plugin [v1.41.1](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v1.41.1).
+  - Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
+  - Mattermost v10.5.8 contains no database or functional changes.
 - **10.5.7, released 2025-05-27**
+  - Mattermost v10.5.7 contains a high severity level security fix. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release is recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
   - Fixed possible deadlocks when updating ``SidebarCategories`` and ``SidebarChannels`` tables [MM-63923](https://mattermost.atlassian.net/browse/MM-63923).
   - Pre-packaged MS Teams plugin [v2.2.1](https://github.com/mattermost/mattermost-plugin-msteams/releases/tag/v2.2.1).
   - Mattermost v10.5.7 contains no database or functional changes.

source/about/mattermost-v9-changelog.md

@@ -9,6 +9,11 @@
 (release-v9-11-extended-support-release)=
 ## Release v9.11 - [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#release-types)
 
+- **9.11.17, released 2025-06-18**
+  - Mattermost v9.11.17 contains high severity level security fixes. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release is recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
+  - Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
+  - Pre-packaged Playbooks plugin [v1.41.1](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v1.41.1).
+  - Mattermost v9.11.17 contains no database or functional changes.
 - **9.11.16, released 2025-05-21**
   - Mattermost v9.11.16 contains a Critical severity level security fix. [Upgrading](https://docs.mattermost.com/upgrade/upgrading-mattermost-server.html) to this release as soon as possible is highly recommended. Details will be posted on our [security updates page](https://mattermost.com/security-updates/) 30 days after release as per the [Mattermost Responsible Disclosure Policy](https://mattermost.com/security-vulnerability-report/).
   - Mattermost v9.11.16 contains no database or functional changes.

source/about/mobile-app-changelog.md

@@ -9,6 +9,20 @@ This changelog summarizes updates to Mattermost mobile apps releases for [Matter
 ```{include} common-esr-support.md
 ```
 
+(release-v2-29-1)=
+## 2.29.1 Release
+ - Release Date: June 18, 2025
+ - Server Versions Supported: Server v10.5.0+ is required. Self-Signed SSL Certificates are not supported unless the user installs the CA certificate on their device.
+
+### Compatibility
+ - **Upgrade to server version v10.5.0 or later is required.** Support for server [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#extended-support-releases) (ESR) v9.11.0 has ended and upgrading to server ESR v10.5.0 or later is required. As we innovate and offer newer versions of our mobile apps, we maintain backwards compatibility only with supported server versions. Users who upgrade to the newest mobile apps while being connected to an unsupported server version can be exposed to compatibility issues, which can cause crashes or severe bugs that break core functionality of the app.
+ - Android operating system 7+ [is required by Google](https://android-developers.googleblog.com/2017/12/improving-app-security-and-performance.html).	
+ - iPhone 6s devices and later with iOS 15.1+ are required.
+
+### Bug Fixes
+ - Fixed an issue where an unread thread on a Direct/Group Message would mark all teams as unread [MM-64335](https://mattermost.atlassian.net/browse/MM-64335).
+ - Fixed an issue with the **Report a Problem** screen not showing all the buttons on small screens [MM-64457](https://mattermost.atlassian.net/browse/MM-64457).
+
 (release-v2-29-0)=
 ## 2.29.0 Release
  - Release Date: June 16, 2025