Skip to content

Commit 9221588

Browse files
aziglerazigler
authored
Merge branch 'master' into debug-server-plugins
2 parents 29bbb9b + c672dfa commit 9221588

12 files changed

Lines changed: 70 additions & 19 deletions

File tree

‎site/config.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ enableEmoji = true
3232

3333
[params.notification]
3434
enable = true
35-
url = "https://mattermost.com/webinar/ai-collaboration-landscape-of-tomorrow/"
36-
text = "[WEBINAR] How AI is Transforming Mission-Critical Work"
35+
url = "https://mattermost.com/webinar/copilot-demo-ai-enhanced-collaboration/"
36+
text = "[WEBINAR] Mattermost Copilot Demo: AI-Enhanced Collaboration"
3737

3838
[params.search]
3939
enable = true

‎site/content/contribute/developer-setup/_index.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,6 @@ If you're using Windows, we recommend using the Windows Subsystem for Linux (WSL
178178
```sh
179179
make stop-server
180180
```
181-
The `stop-server` make target does not stop all the docker containers started by `run-server`. To stop the running docker containers:
182-
```sh
183-
make stop-docker
184-
```
185181
186182
1. Set your options:
187183
Some behaviors can be customized such as running the server in the foreground as described in the `config.mk` file in the server directory. See that file for details.

‎site/content/contribute/more-info/mobile/build-your-own/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ aliases:
1010

1111
You can build the app from source and distribute it within your team or company either using the App Stores, Enterprise App Stores or EMM providers, or another way of your choosing.
1212

13-
At Mattermost, we build and deploy the Apps using a CI pipeline. The pipeline has different jobs and steps that run on specific contexts based on what we want to accomplish. You can check it out {{< newtabref href="https://github.com/mattermost/mattermost-mobile/blob/main/.circleci/config.yml" title="here" >}}.
13+
At Mattermost, we build and deploy the Apps using a CI pipeline. The pipeline has different jobs and steps that run on specific contexts based on what we want to accomplish. You can check it out {{< newtabref href="https://github.com/mattermost/mattermost-mobile/blob/main/.github/workflows" title="here" >}}.
1414

1515
As an alternative we've also created a set of **scripts** to help automate build tasks. Learn more about the scripts by reviewing the {{< newtabref href="https://github.com/mattermost/mattermost-mobile/blob/master/package.json" title="package.json" >}} file.
1616

‎site/content/contribute/more-info/mvp/_index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The title of “Most Valued Professional” is awarded to an outstanding contrib
1414

1515
| Version | Release date | MVP |
1616
|---------|--------------------|-----------------------------------------------------------------------------------|
17+
| 9.9 | June 14, 2024 | {{< newtabref href="https://github.com/annaos" title="Anna Os" >}} and {{< newtabref href="https://github.com/ezekielchow" title="Ezekiel" >}}
1718
| 9.8 | May 16, 2024 | {{< newtabref href="https://github.com/varghesejose2020" title="Varghese Jose" >}}
1819
| 9.7 | April 16, 2024 | {{< newtabref href="https://github.com/tanmaythole" title="Tanmay Thole" >}}
1920
| 9.6 | March 15, 2024 | {{< newtabref href="https://github.com/Syed-Ali-Abbas-Zaidi" title="Syed Ali Abbas Zaidi" >}}

‎site/content/integrate/plugins/components/server/ha.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The proper way to deal with this case would be for the plugin to store the trigg
3131

3232
## Run a scheduled job in high availability mode
3333

34-
Using the {{< newtabref href="https://github.com/mattermost/mattermost-plugin-api/blob/37eccf0f0f3e9e0737d017b555ef3e2e720b3021/cluster/job.go#L112" title="mattermost-plugin-api/cluster" >}} package, we can schedule jobs to perform background activity at regular intervals, without having to explicitly coordinate with other instances of the same plugin. Here's an example from the {{< newtabref href="https://github.com/mattermost/mattermost-plugin-demo/blob/d647f1ed7fdc384f5bc163a6bba689ab4293704e/server/activate_hooks.go#L72" title="Demo Plugin" >}}:
34+
Using the {{< newtabref href="https://github.com/mattermost/mattermost/blob/d2c3710265c293281c2b445d4f72f27871c2e127/server/public/pluginapi/cluster/job.go#L115-L116" title="mattermost/public/pluginapi/cluster" >}} package, we can schedule jobs to perform background activity at regular intervals, without having to explicitly coordinate with other instances of the same plugin. Here's an example from the {{< newtabref href="https://github.com/mattermost/mattermost-plugin-demo/blob/d647f1ed7fdc384f5bc163a6bba689ab4293704e/server/activate_hooks.go#L72" title="Demo Plugin" >}}:
3535

3636
```go
3737
job, cronErr := cluster.Schedule(

‎site/content/integrate/reference/message-priority/_index.md‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
title: "Message priority"
3+
heading: "Use message priority"
4+
description: "Messages can be sent with a priority level to help users identify the importance of the message. For more information about message priority, see [formatting text](https://docs.mattermost.com/collaborate/message-priority.html)."
5+
weight: 50
6+
---
7+
8+
Messages can be sent with a priority level to help users identify the importance of the message. For more information about message priority, see [formatting text](https://docs.mattermost.com/collaborate/message-priority.html).
9+
10+
## Priority options
11+
12+
When sending a message, you can use any of the following to format how you want the posted message to look.
13+
14+
`priority`: A required plain-text summary of the message. This is used in notifications, and in clients that don’t support formatted text (e.g. IRC).
15+
16+
`requested_ack`: If set to `true`, the message will be marked as requiring an acknowledgment from the users by displaying a checkmark icon next to the message. Keep in mind that this requires the message priority to be set to _Important_ or _Urgent_.
17+
18+
`persistent_notifications`: Only for _Urgent_ messages. If set to `true` recipients will receive a persistent notification every five minutes until they acknowledge the message.
19+
20+
## Example of post priority
21+
22+
```json
23+
{
24+
"priority": {
25+
"priority": "urgent",
26+
}
27+
}
28+
```
29+
30+
And this is how it renders on Mattermost:
31+
32+
![Urgent message priority](./message-priority-urgent.jpg)
33+
34+
## Example of post priority with requested acknowledgment
35+
36+
```json
37+
{
38+
"priority": {
39+
"priority": "important",
40+
"requested_ack": true
41+
}
42+
}
43+
```
44+
45+
And this is how it renders on Mattermost:
46+
47+
![Important message priority](./message-priority-requested-ack.jpg)
48+
49+
## Related documentation
50+
51+
- [Message priority](https://docs.mattermost.com/collaborate/message-priority.html)
52+
- [CreatePost API](https://api.mattermost.com/#operation/CreatePost)

‎site/content/integrate/reference/message-priority/message-priority-requested-ack.jpg‎

12.3 KB
Loading

‎site/content/integrate/reference/message-priority/message-priority-urgent.jpg‎

11.3 KB
Loading

‎site/content/integrate/webhooks/incoming/_index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ Incoming webhooks support more than just the `text` field. Here is a full list o
8282
| `attachments` | [Message attachments]({{<ref "/integrate/reference/message-attachments">}}) used for richer formatting options. | If `text` is not set, yes |
8383
| `type` | Sets the post `type`, mainly for use by plugins.<br/>If not blank, must begin with "`custom_`". | No |
8484
| `props` | Sets the post `props`, a JSON property bag for storing extra or meta data on the post.<br/>Mainly used by other integrations accessing posts through the REST API.<br/>The following keys are reserved: `from_webhook`, `override_username`, `override_icon_url`, `override_icon_emoji`, `webhook_display_name`, `card`, and `attachments`.<br/>Props `card` allows for extra information (Markdown-formatted text) to be sent to Mattermost that will only be displayed in the RHS panel after a user selects the **info** icon displayed alongside the post.<br/>The **info** icon cannot be customized and is only rendered visible to the user if there is `card` data passed into the message.<br/>This property is available from Mattermost v5.14.<br/>There is currently no Mobile support for `card` functionality. | No |
85+
| `priority` | Set the priority of the message. See [Message Priority](/integrate/reference/message-priority/) | No |
8586

8687
An example request using more parameters would look like this:
8788

‎site/content/integrate/webhooks/outgoing/_index.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ You can follow these general guidelines to set up a Mattermost outgoing webhook
6969
7070
```json
7171
{"text": "
72-
| Component | Tests Run | Tests Failed |
73-
|:-----------|:------------|:-----------------------------------------------|
74-
| Server | 948 | :white_check_mark: 0 |
75-
| Web Client | 123 | :warning: [2 (see details)](http://linktologs) |
76-
| iOS Client | 78 | :warning: [3 (see details)](http://linktologs) |
72+
| Component | Tests Run | Tests Failed |
73+
|:-----------|:----------|:-----------------------------------------------|
74+
| Server | 948 | :white_check_mark: 0 |
75+
| Web Client | 123 | :warning: [2 (see details)](http://linktologs) |
76+
| iOS Client | 78 | :warning: [3 (see details)](http://linktologs) |
7777
"}
7878
```
7979
@@ -97,6 +97,7 @@ Outgoing webhooks support more than just the `text` field. Here is a full list o
9797
| `attachments` | [Message attachments]({{<ref "/integrate/reference/message-attachments">}}) used for richer formatting options. | If `text` is not set, yes |
9898
| `type` | Sets the post `type`, mainly for use by plugins.<br/>If not blank, must begin with "`custom_`".<br/>Specifying a value for the `attachments` property will cause this field to be ignored, and the `type` value set to `slack_attachment`. | No |
9999
| `props` | Sets the post `props`, a JSON property bag for storing extra or meta data on the post.<br/>Mainly used by other integrations accessing posts through the REST API.<br/>The following keys are reserved: `from_webhook`, `override_username`, `override_icon_url`, `webhook_display_name`, and `attachments`. | No |
100+
| `priority` | Set the priority of the message. See [Message Priority](/integrate/reference/message-priority/) | No |
100101
101102
An example response using more parameters would look like this:
102103

0 commit comments

Comments
 (0)