Skip to content

Commit

Permalink
Merge branch 'master' into resolve-mattermost#3872
Browse files Browse the repository at this point in the history
  • Loading branch information
cwarnermm authored Nov 15, 2024
2 parents 91eba25 + 93835ec commit 2ef80f4
Show file tree
Hide file tree
Showing 113 changed files with 1,665 additions and 872 deletions.
4 changes: 2 additions & 2 deletions source/_static/badges/allplans-cloud-selfhosted.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div class="mm-plans-badge">
```

![plans-img](../_static/images/badges/flag_icon.svg) Available on [all plans](https://mattermost.com/pricing/)
![plans-img](/_static/images/badges/flag_icon.svg) Available on [all plans](https://mattermost.com/pricing/)

![deployment-img](../_static/images/badges/deployment_icon.svg) [Cloud](https://mattermost.com/sign-up/) and [self-hosted](https://mattermost.com/deploy/) deployments
![deployment-img](/_static/images/badges/deployment_icon.svg) [Cloud](https://mattermost.com/sign-up/) and [self-hosted](https://mattermost.com/deploy/) deployments

```{raw} html
</div>
Expand Down
2 changes: 1 addition & 1 deletion source/_static/badges/ent-only.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="mm-plans-badge">
```

![plans-img](../_static/images/badges/flag_icon.svg) Available only on [Enterprise](https://mattermost.com/pricing/) plans
![plans-img](/_static/images/badges/flag_icon.svg) Available only on [Enterprise](https://mattermost.com/pricing/) plans

```{raw} html
</div>
Expand Down
2 changes: 1 addition & 1 deletion source/_static/badges/selfhosted-only.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Note

![deployment-img-yellow](../_static/images/badges/deployment_icon_yellow.svg) Available only for `self-hosted <https://mattermost.com/deploy/>`_ deployments
![deployment-img-yellow](_static/images/badges/deployment_icon_yellow.svg) Available only for `self-hosted <https://mattermost.com/deploy/>`_ deployments

```{raw} html
</div>
Expand Down
6 changes: 6 additions & 0 deletions source/_static/css/mattermost-global.css
Original file line number Diff line number Diff line change
Expand Up @@ -1999,3 +1999,9 @@ mark {
.mermaid text#task20-text {
fill: white !important;
}

/* NESTED TABS */
#check-your-mattermost-client-settings .tab-set .tab-set {
background-color: var(--color-background-secondary);
padding: 0rem 1rem 1rem 1rem;
}
16 changes: 15 additions & 1 deletion source/_static/js/myscript-v1.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $(document).ready(function () {
}

// Listen for changes in the theme preference
window.matchMedia('(prefers-color-scheme: dark)').addListener(function (e) {
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', function (e) {
// Only update the theme based on prefers-color-scheme if 'data-theme' is 'auto' or not set
if (
!$('body').attr('data-theme') ||
Expand Down Expand Up @@ -149,4 +149,18 @@ $(document).ready(function () {
document.body.classList.toggle('nav-open');
document.getElementById('navigation').classList.toggle('nav-is-active');
});

// Remove classes to close the nav if screen size is larger than 992px
function closeNav() {
if (window.innerWidth > 992) {
document.body.classList.remove('nav-open');
document.getElementById('navigation').classList.remove('nav-is-active');
hamburger.classList.remove('is-active');
}
}

closeNav();

$(window).on('resize', closeNav);

});
2 changes: 1 addition & 1 deletion source/about/certifications-and-compliance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Mattermost Enterprise Edition (includes Mattermost Professional & Enterprise) is
The other key areas to be aware of for an export of Mattermost software or technology are:

**Sanctions**: There are comprehensive sanctions to Cuba, Iran, North Korea, Syria, and other countries/territories with specific prohibitions, such as Crimea, Donetsk, and Luhansk regions of Ukraine, Belarus, Russia, Venezuela, Myanmar/Burma, and Cambodia. Details can be
located at `BIS <https://www.bis.doc.gov/index.php/forms-documents/regulations-docs/federal-register-notices/federal-register-2014/1063-746-1/file>`_ and `OFAC <https://www.treasury.gov/resource-center/sanctions/Pages/default.aspx>`_. The countries and their sanctions are subject to change.
located at `BIS <https://www.bis.doc.gov/index.php/forms-documents/regulations-docs/federal-register-notices/federal-register-2014/1063-746-1/file>`_ and `OFAC <https://ofac.treasury.gov/>`_. The countries and their sanctions are subject to change.

**WMD (Weapons of Mass Destruction)**: Mattermost, its customers and its business partners may not export to parties involved
in `proliferation <https://www.bis.doc.gov/index.php/documents/regulation-docs/413-part-736-general-prohibitions/file>`_ of weapons of mass destruction, along with other prohibited end-uses under the U.S. Export Administration Regulations (“EAR”).
Expand Down
52 changes: 26 additions & 26 deletions source/about/cloud-subscriptions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,32 @@ Enterprises can choose between dedicated and shared infrastructure based on your
Compare offerings
-----------------

+-------------------------------+---------------+------------+
| **Resource** | **Dedicated** | **Shared** |
+===============================+===============+============+
| Mattermost High Availability | YES | YES |
| cluster-based deployment | | |
+-------------------------------+---------------+------------+
| Network policy | YES | YES |
+-------------------------------+---------------+------------+
| Namespace | YES | YES |
+-------------------------------+---------------+------------+
| Network | YES | NO |
+-------------------------------+---------------+------------+
| Kubernetes High Availability | YES | NO |
+-------------------------------+---------------+------------+
| Database High Availability | YES | NO |
+-------------------------------+---------------+------------+
| Object storage | YES | NO |
+-------------------------------+---------------+------------+
| Encryption keys | YES | NO |
+-------------------------------+---------------+------------+
| Custom backup schedule | YES | NO |
+-------------------------------+---------------+------------+
| IP Filtering | YES | YES |
+-------------------------------+---------------+------------+
| Bring your own key | YES | NO |
+-------------------------------+---------------+------------+
+-------------------------------+---------------+-------------+
| **Resource** | **Dedicated** | **Shared** |
+===============================+===============+=============+
| Mattermost High Availability | |checkmark| | |checkmark| |
| cluster-based deployment | | |
+-------------------------------+---------------+-------------+
| Network policy | |checkmark| | |checkmark| |
+-------------------------------+---------------+-------------+
| Namespace | |checkmark| | |checkmark| |
+-------------------------------+---------------+-------------+
| Network | |checkmark| | |
+-------------------------------+---------------+-------------+
| Kubernetes High Availability | |checkmark| | |
+-------------------------------+---------------+-------------+
| Database High Availability | |checkmark| | |
+-------------------------------+---------------+-------------+
| Object storage | |checkmark| | |
+-------------------------------+---------------+-------------+
| Encryption keys | |checkmark| | |
+-------------------------------+---------------+-------------+
| Custom backup schedule | |checkmark| | |
+-------------------------------+---------------+-------------+
| IP Filtering | |checkmark| | |checkmark| |
+-------------------------------+---------------+-------------+
| Bring your own key | |checkmark| | |
+-------------------------------+---------------+-------------+

Frequently asked questions about Mattermost Cloud
-------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions source/about/deprecated-features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ Removed features in upcoming versions
Mattermost Server v10.5.0
~~~~~~~~~~~~~~~~~~~~~~~~~

- In the February 2025 Mattermost release (and next ESR), the Mattermost server will stop supporting manual plugin deployment. Plugins are deployed manually when an administrator or some deployment automation copies the contents of a plugin bundle into the server's working directory. If a manual or automated deployment workflow is still required, administrators can instead prepackage the plugin bundles. See more details in `this forum post <https://forum.mattermost.com/t/deprecation-notice-manual-plugin-deployment/21192>`_.
- In the February 2025 Mattermost release (and next ESR), the Mattermost server will stop supporting manual plugin deployment. Plugins are deployed manually when an administrator or some deployment automation copies the contents of a plugin bundle into the server's working directory. If a manual or automated deployment workflow is still required, administrators can instead prepackage the plugin bundles. See more details in `this forum post <https://forum.mattermost.com/t/deprecation-notice-manual-plugin-deployment/21192>`__.

Mattermost Server v10.3.0
~~~~~~~~~~~~~~~~~~~~~~~~~

- As part of our continuous efforts to enhance your user experience, we will be phasing out the Classic Mobile App. Please download the new v2 Mobile App from the `Apple App Store <https://apps.apple.com/us/app/mattermost/id1257222717>`_ or `Google Play Store <https://play.google.com/store/apps/details?id=com.mattermost.rn>`_ to continue enjoying our services without interruption. See more details in the `classic mobile app deprecation <https://forum.mattermost.com/t/classic-mobile-app-deprecation/18703>`_ Mattermost forum post.

Removed features by Mattermost version
----------------------------------------

Mattermost Server v10.2.0
~~~~~~~~~~~~~~~~~~~~~~~~~

- Docker Content Trust (DCT) for signing Docker image artifacts will be replaced by Sigstore Cosign in our upcoming release, v10.2 (November, 2024). If you rely on artifact verification using DCT, please `transition to using Cosign <https://edu.chainguard.dev/open-source/sigstore/cosign/how-to-install-cosign/>`_. See `this forum post <https://forum.mattermost.com/t/upcoming-dct-deprecation/19275>`_ for more details.

Removed features by Mattermost version
----------------------------------------
- Docker Content Trust (DCT) for signing Docker image artifacts has been replaced by Sigstore Cosign in v10.2 (November, 2024). If you rely on artifact verification using DCT, please `transition to using Cosign <https://edu.chainguard.dev/open-source/sigstore/cosign/how-to-install-cosign/>`_. See `this forum post <https://forum.mattermost.com/t/upcoming-dct-deprecation/19275>`__ for more details.

Mattermost Server v10.0.0
~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
8 changes: 4 additions & 4 deletions source/about/desktop-app-changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Mattermost v5.8.0 contains low to medium severity level security fixes. Upgradin

**Release Date: December 15, 2023**

**Download Binaries:** [Mattermost Desktop on GitHub](https://github.com/mattermost/desktop/releases/tag/v5.6.0>)
**Download Binaries:** [Mattermost Desktop on GitHub](https://github.com/mattermost/desktop/releases/tag/v5.6.0)

### Compatibility

Expand Down Expand Up @@ -557,7 +557,7 @@ Mattermost v5.1.0 contains a low severity level security fix. Upgrading is highl

#### macOS

- Mattermost can now be installed on the [Mac App Store](https://apps.apple.com/app/mattermost-desktop/id1614666244). Even if you’re already using Mattermost desktop on Mac, you can download and install it via the Mac App Store to access future automatic updates.
- Mattermost can now be installed on the [Mac App Store](https://apps.apple.com/us/app/mattermost-desktop/id1614666244?mt=12). Even if you’re already using Mattermost desktop on Mac, you can download and install it via the Mac App Store to access future automatic updates.

#### Linux

Expand Down Expand Up @@ -1324,7 +1324,7 @@ Release date: May 16, 2018

- Updated design for loading animation icon.
- Improved appearance of server tabs.
- Enabled [Certificate Transparency](https://www.certificate-transparency.org/what-is-ct) verification in HTTPS.
- Enabled [Certificate Transparency](https://certificate.transparency.dev/) verification in HTTPS.

#### Windows

Expand Down Expand Up @@ -1807,7 +1807,7 @@ Version number updated to 3.4 to make numbering consistent with Mattermost serve

- Added an option to flash taskbar icon when a new message is received
- Added a badge to count mentions on the taskbar icon (for Unity)
- Added a script, `create_desktop_file.sh` to create `Mattermost.desktop` desktop entry to help [integrate the application into a desktop environment](https://wiki.archlinux.org/index.php/Desktop_entries) more easily
- Added a script, `create_desktop_file.sh` to create `Mattermost.desktop` desktop entry to help [integrate the application into a desktop environment](https://wiki.archlinux.org/title/Desktop_entries) more easily
- Added access to the settings menu from the system tray icon
- Only one instance of the desktop application will now load at a time

Expand Down
2 changes: 1 addition & 1 deletion source/about/editions-and-offerings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ This offering includes all the features of `Mattermost Professional <#mattermost
- :doc:`Advanced configuration of playbook permissions, and analytics dashboards </repeatable-processes/share-and-collaborate>`
- :doc:`Channel export </comply/export-mattermost-channel-data>`
- :ref:`Enhanced compliance controls and granular audit logs with data export <manage/logging:audit logging (beta)>`.
- :doc:`Advanced collaboration with shared channels across Mattermost instances </onboard/shared-channels>`.
- :doc:`Advanced collaboration with connected workspaces across Mattermost instances </onboard/connected-workspaces>`.
- :doc:`High availability support with multi-node database deployment </scale/high-availability-cluster-based-deployment>`.
- :doc:`Horizontal scaling through cluster-based deployment </scale/scaling-for-enterprise>`.
- :doc:`Advanced performance monitoring </scale/deploy-prometheus-grafana-for-performance-monitoring>`.
Expand Down
5 changes: 5 additions & 0 deletions source/about/faq-integrations.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Integration questions
=====================

What integrations come pre-packaged with Mattermost Server?
------------------------------------------------------------

See the :doc:`integrate and extend </guides/integrate-and-extend>` documentation for details on pre-packaged integrations available with Mattermost Server.

Can I use Mattermost to add messaging functionality to my proprietary SaaS service?
------------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion source/about/faq-license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Mattermost Websites
| Website | License | Terms and Conditions | Privacy Policy |
+============================+==================================================================================================================================================================+=======================================================================================+===========================================================================================================================+
| Mattermost Websites: | Open source under | `Mattermost Terms of Use <https://mattermost.com/terms-of-service/>`__ | `Mattermost Websites Privacy Policy <https://mattermost.com/privacy-policy/>`__ |
| | `Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License (CC BY-NC-SA 3.0) <https://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US>`__. | | |
| | `Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License (CC BY-NC-SA 3.0) <https://creativecommons.org/licenses/by-nc-sa/3.0/deed.en>`__. | | |
| - about.mattermost.com | | | |
| - mattermost.com | | | |
| - mattermost.org | | | |
Expand Down
2 changes: 1 addition & 1 deletion source/about/faq-video-audio-screensharing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ What support is available for video and audio calling and screen sharing?

Start secure audio calls with screen sharing support directly within Mattermost with :doc:`Mattermost Calls </collaborate/make-calls>`.

Visit the `Mattermost Marketplace <https://mattermost.com/marketplace/>`_ to learn more about more popular options available, including self-hosted, self-hosted private cloud solutions, and vendor-hosted SaaS solutions.
See the :doc:`collaborate with audio and video </collaborate/collaborate-with-audio-video>` documentation for details on additional video conferencing integrations available for Mattermost.
2 changes: 1 addition & 1 deletion source/about/mattermost-desktop-releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
```

```{Important}
Support for Mattermost Server v9.5 [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#extended-support-releases) is coming to the end of its life cycle in November 15, 2024. Upgrading to Mattermost Server v9.11 or later is recommended.
Support for Mattermost Server v9.5 [Extended Support Release](https://docs.mattermost.com/about/release-policy.html#extended-support-releases) has come to the end of its life cycle on November 15, 2024. Upgrading to Mattermost Server v9.11 or later is required.
```

## Frequency
Expand Down
Loading

0 comments on commit 2ef80f4

Please sign in to comment.