Merge branch 'master' into justine-customer-portal

Justine Geffen · Justine Geffen · commit d50ae923399e · 2020-04-24T18:57:05.000+02:00
* master: escaped the double quote so the html renders correctly. (#3558) Update extended-support-release.rst (#3557) Added pre-requisite (#3549) Update myscript.js (#3554) v5.22.1 docs (#3553) Added GA tracking code to rating widget. (#3552)
diff --git a/source/administration/changelog.md b/source/administration/changelog.md
@@ -6,8 +6,8 @@ Also see [changelog in progress](http://bit.ly/2nK3cVf) for the next release.
 
 ## Release v5.22 - [Feature Release](https://docs.mattermost.com/process/release-faq.html#release-overview)
 
-- **v5.22.1, release day TBD**
-  - Investigating an issue where Amazon S3 file storage with IAM credentials fails due to a bug in the ``minio-go`` library. [MM-24388](https://mattermost.atlassian.net/browse/MM-24388)
+- **v5.22.1, released 2020-04-23**
+  - Fixed an issue where Amazon S3 file storage with IAM credentials failed due to a bug in the ``minio-go`` library. [MM-24388](https://mattermost.atlassian.net/browse/MM-24388)
 - **v5.22.0, released 2020-02-16**
   - Original 5.22.0 release
 
diff --git a/source/administration/extended-support-release.rst b/source/administration/extended-support-release.rst
@@ -62,3 +62,12 @@ If we increase the support window, it decreases how much we can develop the prod
 Can customers pay for extended support?
 ---------------------------------------
 At this point, we are not planning on letting customers pay for extended support, but we are open to discuss options for this. Please speak to your Customer Success Manager if you have additional requirements for extended support.
+
+How do we notify customers about new and deprecated Extended Support Releases?
+------------------------------------------------------------------------------
+
+For a new upcoming ESR, we send out an email announcement 2 months in advance. We also add a reminder on our release announcement, changelog and via a Forum post (`see example <https://forum.mattermost.org/t/upcoming-extended-support-release-updates/8526>`_).
+
+For a deprecated ESR, we send out an email announcement 3 months in advance. We also add reminders on our release announcements, changelogs, `important upgrade notes <https://docs.mattermost.com/administration/important-upgrade-notes.html>`_, and our `Forum site <https://forum.mattermost.org/>`_.
+
+To receive updates about Extended Support Releases, sign up for our mailing list `here <http://eepurl.com/dCKn2P>`_.
diff --git a/source/administration/version-archive.rst b/source/administration/version-archive.rst
@@ -6,10 +6,10 @@ If you want to check that the version of Mattermost you are installing is the of
 Mattermost Enterprise Edition
 ------------------------------
 
-Mattermost Enterprise Edition v5.22.0 - `View Changelog <https://docs.mattermost.com/administration/changelog.html#release-v5-22-feature-release>`__ - `Download <https://releases.mattermost.com/5.22.0/mattermost-5.22.0-linux-amd64.tar.gz>`__
-  - ``https://releases.mattermost.com/5.22.0/mattermost-5.22.0-linux-amd64.tar.gz``
-  - SHA-256 Checksum: ``40ecb25fca5a1c277f25b60ec97dbdbbf348622dbb75ae6041e2c9d405221650``
-  - GPG Signature: https://releases.mattermost.com/5.22.0/mattermost-5.22.0-linux-amd64.tar.gz.sig
+Mattermost Enterprise Edition v5.22.1 - `View Changelog <https://docs.mattermost.com/administration/changelog.html#release-v5-22-feature-release>`__ - `Download <https://releases.mattermost.com/5.22.1/mattermost-5.22.1-linux-amd64.tar.gz>`__
+  - ``https://releases.mattermost.com/5.22.1/mattermost-5.22.1-linux-amd64.tar.gz``
+  - SHA-256 Checksum: ``f4387c393ed70a6674aa30e06ab832d2ef9878110f089e07319a4e314f625acd``
+  - GPG Signature: https://releases.mattermost.com/5.22.1/mattermost-5.22.1-linux-amd64.tar.gz.sig
 Mattermost Enterprise Edition v5.21.0 - `View Changelog <https://docs.mattermost.com/administration/changelog.html#release-v5-21-quality-release>`__ - `Download <https://releases.mattermost.com/5.21.0/mattermost-5.21.0-linux-amd64.tar.gz>`__
   - ``https://releases.mattermost.com/5.21.0/mattermost-5.21.0-linux-amd64.tar.gz``
   - SHA-256 Checksum: ``909b17498139cd511d4e5483e2b7be0b757ac28ea5063be9c3d82cbe49b4a696``
@@ -175,10 +175,10 @@ Mattermost Enterprise Edition v2.1.0 - `View Changelog <https://docs.mattermost.
 Mattermost Team Edition Server Archive
 ---------------------------------------
 
-Mattermost Team Edition v5.22.0 - `View Changelog <https://docs.mattermost.com/administration/changelog.html#release-v5-22-feature-release>`__ - `Download <https://releases.mattermost.com/5.22.0/mattermost-team-5.22.0-linux-amd64.tar.gz>`__
-  - ``https://releases.mattermost.com/5.22.0/mattermost-team-5.22.0-linux-amd64.tar.gz``
-  - SHA-256 Checksum: ``28ae09394672f1bdda5ab739c7d47f844388b91354b0a0011fa4f16974a85090``
-  - GPG Signature: https://releases.mattermost.com/5.22.0/mattermost-team-5.22.0-linux-amd64.tar.gz.sig
+Mattermost Team Edition v5.22.1 - `View Changelog <https://docs.mattermost.com/administration/changelog.html#release-v5-22-feature-release>`__ - `Download <https://releases.mattermost.com/5.22.1/mattermost-team-5.22.1-linux-amd64.tar.gz>`__
+  - ``https://releases.mattermost.com/5.22.1/mattermost-team-5.22.1-linux-amd64.tar.gz``
+  - SHA-256 Checksum: ``4d108be08247649ff7f64dd8c9057ebed9905f76e3bcff49fbe920cb0d9963ba``
+  - GPG Signature: https://releases.mattermost.com/5.22.1/mattermost-team-5.22.1-linux-amd64.tar.gz.sig
 Mattermost Team Edition v5.21.0 - `View Changelog <https://docs.mattermost.com/administration/changelog.html#release-v5-21-quality-release>`__ - `Download <https://releases.mattermost.com/5.21.0/mattermost-team-5.21.0-linux-amd64.tar.gz>`__
   - ``https://releases.mattermost.com/5.21.0/mattermost-team-5.21.0-linux-amd64.tar.gz``
   - SHA-256 Checksum: ``4d81e27dd107ba3c66ad06b3e029c2e1b940a0f56b46250d9ebccb4edf3e50eb``
diff --git a/source/deployment/auth.rst b/source/deployment/auth.rst
@@ -6,6 +6,11 @@ For organizations who require multi-factor authentication ("MFA") as part of the
 
 Supported smartphones include iOS, Android, Blackberry and Windows Phone devices that are able to install `Google Authenticator <https://support.google.com/accounts/answer/1066447?hl=en>`__. Other than requiring internet access to download and install Google Authenticator, the phone used for Mattermost MFA does not require internet access.
 
+Prerequisite
+-------------
+Ensure that your server system time is accurate as the MFA implementation relies on Time-based One-time passwords (TOTP).
+
+
 Enabling MFA
 ------------
 
@@ -24,6 +29,3 @@ Users will not be able to remove MFA from their account while enforcement is on.
 
 Since turning on MFA enforcement prevents users from accessing the site until set up is complete, it is recommended you turn on enforcement during non-peak hours when people are less likely to be using the system.
 
-
-
-
diff --git a/source/myscript.js b/source/myscript.js
@@ -1,5 +1,6 @@
 $(document).ready(function(){
-	$('body').append("<div class='c-thermometer'><div class='c-thermometer__trigger'><div>🙂</div></div><div class='c-thermometer__popup'><div class='c-thermometer__close'>×</div><p class='c-thermometer__paragraph'>Is this page helpful?</p> <div class='c-thermometer__emojis'> <a href='javascript:void(0)' onClick='ga('send', 'event', { eventCategory: 'Feedback', eventAction: 'Click', eventLabel: 'Excellent', eventValue: 1});'> <span class='c-thermometer__emoji'>😀</span> <p>Excellent</p> </a> <a href='javascript:void(0)' onClick='ga('send', 'event', { eventCategory: 'Feedback', eventAction: 'Click', eventLabel: 'Average', eventValue: 3});'> <span class='c-thermometer__emoji'>😐</span> <p>Average</p> </a> <a href='javascript:void(0)' onClick='ga('send', 'event', { eventCategory: 'Feedback', eventAction: 'Click', eventLabel: 'Poor', eventValue: 4});'> <span class='c-thermometer__emoji'>🙁</span> <p>Poor</p> </a> </div></div></div>");
+	var thermometerHtml = "<div class='c-thermometer'><div class='c-thermometer__trigger'><div>🙂</div></div><div class='c-thermometer__popup'><div class='c-thermometer__close'>×</div><p class='c-thermometer__paragraph'>Is this page helpful?</p> <div class='c-thermometer__emojis'> <a href='javascript:void(0)' onClick=\"ga('send', 'event', {'sendTo':'UA-67846571-2', eventCategory: 'Feedback', eventAction: 'Click', eventLabel: 'Excellent', eventValue: 1});\"> <span class='c-thermometer__emoji'>😀</span> <p>Excellent</p> </a> <a href='javascript:void(0)' onClick=\"ga('send', 'event', {'sendTo':'UA-67846571-2', eventCategory: 'Feedback', eventAction: 'Click', eventLabel: 'Average', eventValue: 3});\"> <span class='c-thermometer__emoji'>😐</span> <p>Average</p> </a> <a href='javascript:void(0)' onClick=\"ga('send', 'event', {'sendTo':'UA-67846571-2', eventCategory: 'Feedback', eventAction: 'Click', eventLabel: 'Poor', eventValue: 4});\"> <span class='c-thermometer__emoji'>🙁</span> <p>Poor</p> </a> </div></div></div>";
+	$('body').append(thermometerHtml);
 
 	$('header .links__icon').on('click', function (){
 		$("header .header__searchbar").hide();
