Skip to content

Commit 4c154d8

Browse files
authored
Merge branch 'master' into v10.10-documentation
2 parents 2c5a3d2 + 5c8afa4 commit 4c154d8

17 files changed

+183
-75
lines changed

.github/workflows/claude.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Claude Code
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
pull_request_review_comment:
7+
types: [created]
8+
issues:
9+
types: [opened, assigned]
10+
pull_request_review:
11+
types: [submitted]
12+
13+
jobs:
14+
claude:
15+
if: |
16+
(github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
17+
(github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
18+
(github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
19+
(github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
20+
runs-on: ubuntu-latest
21+
permissions:
22+
contents: read
23+
pull-requests: read
24+
issues: read
25+
id-token: write
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v4
29+
with:
30+
fetch-depth: 1
31+
32+
- name: Run Claude Code
33+
id: claude
34+
uses: anthropics/claude-code-action@beta
35+
with:
36+
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
37+
38+
# Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4)
39+
# model: "claude-opus-4-20250514"
40+
41+
# Optional: Customize the trigger phrase (default: @claude)
42+
# trigger_phrase: "/claude"
43+
44+
# Optional: Trigger when specific user is assigned to an issue
45+
# assignee_trigger: "claude-bot"
46+
47+
# Optional: Allow Claude to run specific commands
48+
# allowed_tools: "Bash(npm install),Bash(npm run build),Bash(npm run test:*),Bash(npm run lint:*)"
49+
50+
# Optional: Add custom instructions for Claude to customize its behavior for your project
51+
# custom_instructions: |
52+
# Follow our coding standards
53+
# Ensure all new code has tests
54+
# Use TypeScript for new files
55+
56+
# Optional: Custom environment variables for Claude
57+
# claude_env: |
58+
# NODE_ENV: test
59+

extensions/sitemap/__init__.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,8 @@ def create_sitemap(app: Sphinx, exception):
195195

196196
url = ElementTree.SubElement(root, "url")
197197
scheme = app.config.sitemap_url_scheme
198-
if app.builder.config.language:
199-
lang = app.builder.config.language + "/"
200-
else:
201-
lang = ""
198+
199+
lang = ""
202200

203201
ElementTree.SubElement(url, "loc").text = site_url + scheme.format(
204202
lang=lang, version=version, link=link

source/_static/css/mattermost-global.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,4 +2004,13 @@ mark {
20042004
#check-your-mattermost-client-settings .tab-set .tab-set {
20052005
background-color: var(--color-background-secondary);
20062006
padding: 0rem 1rem 1rem 1rem;
2007+
}
2008+
2009+
/* Image borders */
2010+
img {
2011+
border: 1px solid #d3d3d3;
2012+
}
2013+
2014+
body:not([data-custom-theme="light"]) img {
2015+
border: 1px solid #4a4a4a;
20072016
}

source/about/editions-and-offerings.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Mattermost Enterprise Advanced
4848
Mattermost Enterprise Advanced is the :doc:`Intelligent Mission Environment </about/product>` for Cyber Defense and Mission Operations that features:
4949

5050
- :doc:`Classified and Sensitive Information Controls </collaborate/display-channel-banners>`
51-
- :doc:`Zero Trust Security </manage/admin/zero-trust-security>` with dynamic attribute-based policy controls, environmental atributes, and User Authoritative Source integration
51+
- :doc:`Zero Trust Security </manage/admin/attribute-based-access-control>` with dynamic attribute-based policy controls, environmental atributes, and User Authoritative Source integration
5252
- :doc:`Mobile security </about/security/mobile-security>` controls
5353
- :doc:`Air-gapped deployment workflows </deploy/server/air-gapped-deployment>`
5454

source/about/mattermost-server-releases.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ Mattermost releases a new server version on the 16th of each month in [binary fo
1818

1919
| **Release** | **Released on** | **Support ends** |
2020
|:---|:---|:---|
21-
| 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 |
22-
| 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 |
23-
| 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 |
21+
| 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 |
22+
| 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 |
23+
| 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 |
2424
| 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 |
25-
| 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>` |
25+
| 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>` |
2626
| 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 |
2727
| 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 |
2828
| 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 |
2929
| 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 |
3030
| 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 |
31-
| 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>` |
31+
| 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>` |
3232
| 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 |
3333
| 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 |
3434
| 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

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
(release-v10.9-feature-release)=
77
## Release v10.9 - [Feature Release](https://docs.mattermost.com/about/release-policy.html#release-types)
88

9-
- **10.9.1, release day TBD**
10-
- Fixing an issue where Direct/Group Messages are sometimes missing on initial load [MM-64481](https://mattermost.atlassian.net/browse/MM-64481).
9+
- **10.9.1, released 2025-06-17**
10+
- 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/).
11+
- Fixed an issue where Direct/Group Messages were missing on initial load [MM-64481](https://mattermost.atlassian.net/browse/MM-64481).
12+
- Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
13+
- Mattermost v10.9.1 contains no database or functional changes.
1114
- **10.9.0, released 2025-06-16**
1215
- Original 10.9.0 release.
1316

@@ -112,6 +115,17 @@ New setting options were added to ``config.json``. Below is a list of the additi
112115
(release-v10.8-feature-release)=
113116
## Release v10.8 - [Feature Release](https://docs.mattermost.com/about/release-policy.html#release-types)
114117

118+
- **10.8.3, released 2025-06-18**
119+
- 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/).
120+
- Pre-packaged Playbooks plugin [v1.41.1](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v1.41.1).
121+
- Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
122+
- Fixed an issue where the ``icon_emoji`` property was not working for webhook posts [MM-64316](https://mattermost.atlassian.net/browse/MM-64316).
123+
- Added support for SSO while Mattermost is embedded in an iframe [MM-63900](https://mattermost.atlassian.net/browse/MM-63900).
124+
- Mattermost v10.8.3 contains no database or functional changes.
125+
- **10.8.2, released 2025-05-29**
126+
- 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/).
127+
- Pre-packaged MS Teams plugin [v2.2.1](https://github.com/mattermost/mattermost-plugin-msteams/releases/tag/v2.2.1).
128+
- Mattermost v10.8.2 contains no database or functional changes.
115129
- **10.8.1, released 2025-05-21**
116130
- 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/).
117131
- 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
196210
(release-v10.7-feature-release)=
197211
## Release v10.7 - [Feature Release](https://docs.mattermost.com/about/release-policy.html#release-types)
198212

213+
- **10.7.4, released 2025-06-18**
214+
- 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/).
215+
- Pre-packaged MS Teams plugin [v2.2.1](https://github.com/mattermost/mattermost-plugin-msteams/releases/tag/v2.2.1).
216+
- Pre-packaged Playbooks plugin [v1.41.1](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v1.41.1).
217+
- Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
218+
- Added support for SSO while Mattermost is embedded in an iframe [MM-63900](https://mattermost.atlassian.net/browse/MM-63900).
219+
- Mattermost v10.7.4 contains no database or functional changes.
199220
- **10.7.3, released 2025-05-21**
200221
- 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/).
201222
- 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
394415
(release-v10.5-extended-support-release)=
395416
## Release v10.5 - [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#release-types)
396417

418+
- **10.5.8, released 2025-06-18**
419+
- 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/).
420+
- Fixed an issue where unreads from deleted teams would display in the titlebar/Desktop App [MM-63933](https://mattermost.atlassian.net/browse/MM-63933).
421+
- Pre-packaged Playbooks plugin [v1.41.1](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v1.41.1).
422+
- Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
423+
- Mattermost v10.5.8 contains no database or functional changes.
397424
- **10.5.7, released 2025-05-27**
425+
- 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/).
398426
- Fixed possible deadlocks when updating ``SidebarCategories`` and ``SidebarChannels`` tables [MM-63923](https://mattermost.atlassian.net/browse/MM-63923).
399427
- Pre-packaged MS Teams plugin [v2.2.1](https://github.com/mattermost/mattermost-plugin-msteams/releases/tag/v2.2.1).
400428
- Mattermost v10.5.7 contains no database or functional changes.

source/about/mattermost-v9-changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
(release-v9-11-extended-support-release)=
1010
## Release v9.11 - [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#release-types)
1111

12+
- **9.11.17, released 2025-06-18**
13+
- 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/).
14+
- Pre-packaged Boards plugin version [v9.1.3](https://github.com/mattermost/mattermost-plugin-boards/releases/tag/v9.1.3).
15+
- Pre-packaged Playbooks plugin [v1.41.1](https://github.com/mattermost/mattermost-plugin-playbooks/releases/tag/v1.41.1).
16+
- Mattermost v9.11.17 contains no database or functional changes.
1217
- **9.11.16, released 2025-05-21**
1318
- 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/).
1419
- Mattermost v9.11.16 contains no database or functional changes.

0 commit comments

Comments
 (0)