Merge branch 'master' into ensuring-scale-perf

mattermost · Sep 17, 2024 · 6c13e5e · 6c13e5e
2 parents 037224b + 6d4fb98
commit 6c13e5e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/source/_static/js/myscript-v1.js b/source/_static/js/myscript-v1.js
@@ -65,11 +65,11 @@ $(document).ready(function () {
 
     // Notification Banner
 
-    // Fallback for when a notification CTA expires - ie. webinar happens
+    // Fallback for when a notification CTA expires
     const dateInFuture = (value) =>
         new Date().getTime() <= new Date(value).getTime();
-    const expiryDate = '2024-09-10T00:00:00-0500';
-    // 2024-09-10 @ 12am EST
+    const expiryDate = '2024-11-10T00:00:00-0500';
+    // 12am EST
     const fallback_url =
         'https://mattermost.com/solutions/mattermost-for-microsoft-teams/';
     const fallback_text = 'Learn more about Mattermost for Microsoft Teams »';
@@ -85,7 +85,7 @@ $(document).ready(function () {
     // So it will show up for new announcements
     // Keep "mm_notification_banner__" at the beginning of the key
     // Add system to clean out storage items that are no longer needed
-    let notification_banner_key = 'mm_notification_banner__ed-survey-announcement';
+    let notification_banner_key = 'mm_notification_banner__v10-mst-sept';
     if (!dateInFuture(expiryDate)) {
         notification_banner_key = 'mm_notification_banner__fallback-mst';
     }

diff --git a/source/_templates/custom-nav.html b/source/_templates/custom-nav.html
@@ -4,7 +4,7 @@
             <span aria-hidden="true">×</span>
         </a>
 	    <div class="notification-bar__wrapper">
-		    <a href="https://docs.google.com/forms/d/e/1FAIpQLSfWe9qqwYGdTYBsuXFjBloASNNwI8WwInpV-ycflIA4J7zIUg/viewform?usp=sf_link" target="_blank" class="notification-bar__link"><img src="{{ pathto('_static/images/notification-bar/icon-megaphone.svg', 1) }}" alt="">Share your thoughts on Mattermost product training and documentation »</a>
+		    <a href="https://mattermost.com/blog/microsoft-teams-m365-mission-critical-workflows/" target="_blank" class="notification-bar__link"><img src="{{ pathto('_static/images/notification-bar/icon-megaphone.svg', 1) }}" alt="">Mattermost v10.0 is now available! Learn what's new »</a>
 		</div>
     </div>
 </div>

diff --git a/source/configure/plugins-configuration-settings.rst b/source/configure/plugins-configuration-settings.rst
@@ -944,7 +944,7 @@ Enable call ringing
 .. config:setting:: plugins-enablecallringing
   :displayname: Enable call ringing (Plugins - Calls)
   :systemconsole: Plugins > Calls
-  :configjson: PluginSettings.Plugins.com.mattermost.calls. enableringing
+  :configjson: PluginSettings.Plugins.com.mattermost.calls.enableringing
   :environment: N/A
 
   - **true**: Ringing functionality is enabled. Direct and group message participants receive a desktop app alert and a ringing notification when a call starts.
@@ -957,6 +957,29 @@ Enable call ringing
 | - **false**: **(Default**) Ringing functionality is disabled.            |                                                                                             |
 +--------------------------------------------------------------------------+---------------------------------------------------------------------------------------------+
 
+Enable AV1 (Experimental)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. config:setting:: plugins-enableav1
+  :displayname: Enable AV1 codec for screen sharing (Plugins - Calls)
+  :systemconsole: Plugins > Calls
+  :configjson: PluginSettings.Plugins.com.mattermost.calls.enableAV1
+  :environment: N/A
+
+  - **true**: Enables the ability to use the AV1 codec to encode screen sharing tracks. This can result in improved screen sharing quality for clients that support it.
+  - **false**: **(False)** AV1 codec is disabled for screen sharing tracks.
+
++--------------------------------------------------------------------------+---------------------------------------------------------------------------------------------+
+| - **true**: Enables the ability to use the AV1 codec to encode screen    | - System Config path: **Plugins > Calls**                                                   |
+|   sharing tracks. Can result in improved screen sharing quality via      | - ``config.json`` setting: ``PluginSettings.Plugins.com.mattermost.calls.enableAV1``        |
+|   clients that support AV1 encoding.                                     | - Environment variable: N/A                                                                 |
+| - **false**: **(Default**) AV1 codec is disabled for screen sharing      |                                                                                             |
+|   tracks.                                                                |                                                                                             |
++--------------------------------------------------------------------------+---------------------------------------------------------------------------------------------+
+| **Note**:  This setting is ignored when                                                                                                                                |
+| :ref:`simulcast is enabled for screen sharing <configure/plugins-configuration-settings:enable simulcast for screen sharing (experimental)>`.                          |
++--------------------------------------------------------------------------+---------------------------------------------------------------------------------------------+
+
 ----
 
 .. config:setting:: integrations-gitlab

diff --git a/source/deploy/postgres-migration.rst b/source/deploy/postgres-migration.rst
@@ -34,7 +34,7 @@ Frequently asked questions
 
 4. Do we/will we bundle pgloader or is that a separate install?
 
-  We do not bundle pgloader with the Mattermost server. You will need to install pgloader separately. For more information, see the :doc:`install pgloader </deploy/manual-postgres-migration:install pgloader>` documentation.
+  We do not bundle pgloader with the Mattermost server. You will need to install pgloader separately. For more information, see the :ref:`install pgloader <deploy/manual-postgres-migration:install pgloader>` documentation.
 
 5. Are there any other migrations available for plugins, or just Boards, Playbooks and Calls?
 
@@ -48,7 +48,7 @@ Troubleshooting
 ---------------
 
 Unsupported authentication for MySQL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you are facing an error due to authentication with MySQL v8, it may be related to a `known issue <https://github.com/dimitri/pgloader/issues/782>`_ with pgloader. The fix is to set the default authentication method to ``mysql_native_password`` in your MySQL configuration. To do so, add the ``default-authentication-plugin=mysql_native_password`` value to your ``mysql.cnf`` file. Also, do not forget to update your user to use this authentication method.
 

diff --git a/source/integrate/gitlab-interoperability.rst b/source/integrate/gitlab-interoperability.rst
@@ -37,7 +37,7 @@ Mattermost configuration
 
 A Mattermost system admin must perform the following steps in Mattermost.
 
-Install the GitHub integration from the in-product App Marketplace:
+Install the GitLab integration from the in-product App Marketplace:
 
 1. In Mattermost, from the Product menu |product-list|, select **App Marketplace**.
 2. Search for or scroll to GitLab, and select **Install**.