Merge branch 'master' into amyblais-patch-9

Author: amyblais

.github/workflows/claude.yml

@@ -0,0 +1,59 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@beta
+        with:
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          
+          # Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4)
+          # model: "claude-opus-4-20250514"
+          
+          # Optional: Customize the trigger phrase (default: @claude)
+          # trigger_phrase: "/claude"
+          
+          # Optional: Trigger when specific user is assigned to an issue
+          # assignee_trigger: "claude-bot"
+          
+          # Optional: Allow Claude to run specific commands
+          # allowed_tools: "Bash(npm install),Bash(npm run build),Bash(npm run test:*),Bash(npm run lint:*)"
+          
+          # Optional: Add custom instructions for Claude to customize its behavior for your project
+          # custom_instructions: |
+          #   Follow our coding standards
+          #   Ensure all new code has tests
+          #   Use TypeScript for new files
+          
+          # Optional: Custom environment variables for Claude
+          # claude_env: |
+          #   NODE_ENV: test
+

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/badges/ent-adv-selfhosted.rst

@@ -0,0 +1,14 @@
+:orphan:
+:nosearch:
+
+.. raw:: html
+
+  <div class="mm-plans-badge">
+
+|plans-img| Available on `Enterprise Advanced plans <https://mattermost.com/pricing/>`__
+
+|deployment-img| `self-hosted <https://mattermost.com/download/>`__ deployments
+
+.. raw:: html
+
+  </div>

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

@@ -19,7 +19,7 @@ For customers using our service in a self-hosted deployment, the `Mattermost Fre
 Mattermost Enterprise Edition 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Our commercial, self-hosted software is called Mattermost Enterprise Edition, and it's available as a Linux binary that deploys identically to our open source version - including upgrading in an identical fashion - with two key differences: It contains code for advanced commercial features and it's offered under a commercial license (https://mattermost.com/enterprise-edition-license/). The commercial license prohibits reverse engineering and tampering with our license key mechanism unlocking paid features so that we can run a compliant and fair commercial business.
+Our commercial, self-hosted software is called Mattermost Enterprise Edition, and it's available as a Linux binary that deploys identically to our open source version - including upgrading in an identical fashion - with 2 key differences: It contains code for advanced commercial features and it's offered under a commercial license (https://mattermost.com/enterprise-edition-license/). The commercial license prohibits reverse engineering and tampering with our license key mechanism unlocking paid features so that we can run a compliant and fair commercial business.
 
 Once you’ve downloaded and installed Mattermost Enterprise Edition within your preferred environment, you have the option to use it as-is in a "free" mode, or you can access Mattermost's commercial features by starting a trial or by purchasing a subscription. You can start a 30-day free Enterprise trial via **System Console > Edition and License > Start trial**, or request a trial online at https://mattermost.com/trial/.
 
@@ -39,6 +39,23 @@ Mattermost plans consist of features and entitlements available either a paid su
 
 The Mattermost Professional, Enterprise, or Enterprise Advanced editions are only available after deploying our Mattermost Enterprise Edition binary, and then applying a valid license key that comes with a subscription purchase. Alternatively, you can start a 30-day free trial that can be activated either in-product (**System Console > Edition and License > Start trial**) or online at https://mattermost.com/trial/.
 
+Mattermost Enterprise Advanced
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: ../_static/badges/cloud-selfhosted.rst
+  :start-after: :nosearch:
+
+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/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>`
+
+Visit the :doc:`Mattermost Plans </about/plans>` page to learn more about the capabilities and features available in Enterprise Advanced. 
+
+A 30-day free trial to preview the features in this subscription can be activated either in-product (**System Console > Edition and License > Start trial**) or via an online request at https://mattermost.com/trial/.
+
 Mattermost Enterprise 
 ~~~~~~~~~~~~~~~~~~~~~
 

source/about/mattermost-mobile-releases.md

@@ -22,7 +22,7 @@ We strongly recommend using the latest mobile app release available that contain
 | **Release** | **Released on** | **Support ends** | **Compatible with** |
 |:---|:---|:---|:---|
 | v2.30 {ref}`FEATURE <release-v2-30-0>` [Download](https://github.com/mattermost/mattermost-mobile/releases/tag/v2.30.0) \| {ref}`Changelog <release-v2-30-0>` | 2025-07-16 | 2025-08-15 | {ref}`v10.10 <release-v10.10-feature-release>`, {ref}`v10.9 <release-v10.9-feature-release>`, {ref}`v10.8 <release-v10.8-feature-release>`, {ref}`v10.5 <release-v10.5-extended-support-release>` |
-| 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 |