Merge branch 'master' into justine-customer-portal

* master:
  Introduce Discord Dark themed Mattermost (#3567)
  Fix link to Cloudron demo (#3570)
  Update migrating.rst (#3571)
  Document plugin labels (#3548)
  Update migrating.rst (#3569)
  Update migrating.rst (#3559)
  Update myscript.js (#3566)
  Update upgrade.rst (#3562)
  Update custom-emoji.rst (#3564)
  Update changelog.md (#3561)
  Add reply arrow example (#3546)
  Update compliance.rst (#3555)
  Move release process docs to handbook (#3542)

Author: Justine Geffen

source/administration/changelog.md

@@ -8,7 +8,7 @@ Also see [changelog in progress](http://bit.ly/2nK3cVf) for the next release.
 
 - **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**
+- **v5.22.0, released 2020-04-16**
   - Original 5.22.0 release
 
 **Release day: 2020-04-16**

source/administration/compliance.rst

@@ -21,7 +21,7 @@ Enabling Compliance Reporting
 
 After purchasing and installing a license key for Enterprise Edition E20: 
 
-1. Go to **System Console > Compliance > Compliance Monitoring** (or **System Console** > **General** > **Compliance** > **Enable Compliance** in versions prior to 5.12) and set the **Enable Compliance Reporting** value to ``true``.
+1. Go to **System Console > Compliance > Compliance Monitoring** (or **System Console > General > Compliance > Enable Compliance** in versions prior to 5.12) and set the **Enable Compliance Reporting** value to **true**.
 2. (Optional) In **Compliance Report Directory** specify the directory in which to place completed compliance reports. Defaults to ``./data/`` if left blank.
 3. Click **Save**. 
 
@@ -32,23 +32,23 @@ Turn on Daily Compliance Reports
 
 After enabling compliance reporting: 
 
-1. Go to **System Console > Compliance > Compliance Monitoring** (or **System Console** > **General** > **Compliance** > **Enable Daily Report** in versions prior to 5.12) and set the **Enable Daily Report** value to ``true``.
+1. Go to **System Console > Compliance > Compliance Monitoring** (or **System Console > General > Compliance > Enable Daily Report** in versions prior to 5.12) and set the **Enable Daily Report** value to **true**.
 2. Click **Save**. 
 
-Your system will now export all new messages posted within a 24-hour period as a .csv file to the location specified in **Compliance Report Directory**. This feature can be used in conjunction with centralized compliance reporting systems that move.
+Your system will now export all new messages posted within a 24-hour period as a ``.csv`` file to the location specified in **Compliance Report Directory**. This feature can be used in conjunction with centralized compliance reporting systems that move.
 
 Run Compliance Reports  
 ======================
 
 Compliance Reports are exports of all messages in Mattermost that match the report criteria. To run a report: 
 
-1. Go to **System Console** > **Compliance Monitoring** (or **System Console > Compliance > Compliance Monitoring** in versions prior to 5.12).
+1. Go to **System Console > > Compliance > Compliance Monitoring** (or **System Console > Compliance > Compliance Monitoring** in versions prior to 5.12).
 2. Fill in the following criteria:  
 
-     - **Job Name:** Name the compliance report you are about to run (e.g., "HR Audit 455").
-     - **From:** Start Date for search in YYYY-MM-DD format (e.g., "2016-03-11").
-     - **To:** End Date of search in YYYY-MM-DD format (e.g., "2016-05-11").
-     - **Emails:** Comma separated list of email addresses of users whose posted messages you want to search (e.g., ``[email protected], [email protected]``).
+     - **Job Name:** Name the compliance report you are about to run (e.g. "HR Audit 455").
+     - **From:** Start Date for search in YYYY-MM-DD format (e.g. "2016-03-11").
+     - **To:** End Date of search in YYYY-MM-DD format (e.g. "2016-05-11").
+     - **Emails:** Comma-separated list of email addresses of users whose posted messages you want to search (e.g. ``[email protected], [email protected]``).
      - **Keywords:** Indicate the words that would be contained in a message for it to be included in the Compliance Report results. 
 3. Click **Run Compliance Report**.
 
@@ -62,7 +62,7 @@ The report will be queued in the display below the fields described above. The p
 - **Requested by:** Email of person requesting the report.
 - **Params:** Parameters of the compliance report request. 
 
-Each Compliance Report includes a **Download** link which downloads a compressed file named ``adhoc-[UNIQUE_ID].zip``. Inside the file is ``meta.json``, which includes the parameters of the search executed and ``posts.csv`` which includes the contents of messages found by the request. 
+Each compliance report includes a **Download** link which downloads a compressed file named ``adhoc-[UNIQUE_ID].zip``. Inside the file is ``meta.json``, which includes the parameters of the search executed and ``posts.csv`` which includes the contents of messages found by the request. 
 
 Compliance query definition stored in ``meta.json`` file 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

source/administration/migrating.rst

@@ -110,7 +110,6 @@ Slack offers two ways to `export your data from their product <https://get.slack
 
 2. You can request a "Corporate Export" from Slack directly to get a larger export including private channels, direct, and group messages. 
 
-Both exports from Slack use the same processes when importing into Mattermost. 
 
 .. note:: As a proprietary SaaS service, Slack is able to change its export format quickly and without notice. If you encounter issues not mentioned in the documentation below, please alert the product team by `filing an issue <https://www.mattermost.org/filing-issues/>`__.
 
@@ -170,7 +169,7 @@ The following limitations are present when importing from Slack:
 Migrating from Slack using the Mattermost Web App
 `````````````````````````````````````````````````
 
-.. note:: For larger imports, particularly those where you have used the `slack-advanced-exporter tool` to add Slack post attachments to the archive or the Corporate Export file, it is recommended to import the Slack data using the `CLI <https://docs.mattermost.com/administration/migrating.html#migrating-from-slack-using-the-mattermost-cli>`__.
+.. note:: For larger imports, particularly those where you have used the `slack-advanced-exporter tool` to add Slack post attachments to the archive or the Corporate Export file, it is recommended to import the Slack data using the `mmetl tool and bulk loading tool <https://docs.mattermost.com/administration/migrating.html#migrating-from-slack-using-the-mattermost-mmetl-tool-and-bulk-import>`__.
 
 1. Generate a Slack export file from **Slack > Administration > Workspace Settings > Import/Export Data > Export > Start Export**. Alternatively, use the Slack Corporate Export file after receiving it from Slack.
 
@@ -190,7 +189,16 @@ Migrating from Slack Using the Mattermost CLI
 
 .. note:: To run the CLI command, you must be in the directory that contains the Mattermost installation. On a default installation of Mattermost, the directory is ``/opt/mattermost/``. Also, if you followed our `installation process <../guides/administrator.html#installing-mattermost>`__, you must run the command as the user *mattermost*. The executable is in the ``bin`` subdirectory and is called ``mattermost``.
 
+Migrating from Slack Using the Mattermost mmetl Tool and Bulk Import
+`````````````````````````````````````````````````````````````````````
+.. note:: This method is the recommended way to import Slack's corporate export file.
 
+1. Use the `slack-advanced-exporter <https://github.com/grundleborg/slack-advanced-exporter>`_ to download attachments and add users' email addresses to your Slack corporate export file.
+
+2. Use the `mmetl tool <https://github.com/mattermost/mmetl>`_ to transform Slack's corporate export file into the ``jsonl`` format required by the bulk import tool.
+
+3. Bulk load the files using the steps provided in the `bulk loading documentation <https://docs.mattermost.com/deployment/bulk-loading.html#bulk-loading-data>`_. 
+   
 Using the Imported Team
 ````````````````````````
 

source/administration/plugins.rst

@@ -20,6 +20,19 @@ The Plugin Marketplace is a collection of plugins that can greatly increase the
 
 .. image:: https://user-images.githubusercontent.com/915956/66891467-1b18eb80-ef9e-11e9-9de3-37a3c5899bd8.png
 
+Plugin Labels
+~~~~~~~~~~~~~~~~
+
+Plugins in the Marketplace are labeled to make it easier for administrators to choose plugins that fit their company's security and risk policies if they do not allow for community plugins to be used. 
+
+**Community Plugins**
+
+Plugins identified as "Community" are produced by the open-source community or partners and the features/roadmap are not controlled directly by Mattermost.  Prior to being listed on the Plugin Marketplace, they are reviewed by the Mattermost development team and code-signed to ensure the code Mattermost reviewed, is delivered.  Mattermost does not directly support these plugins in production environments.
+
+**Beta Plugins**
+
+Plugins may be labeled as "Beta" if they are released to the Plugin Marketplace early for customer previews.  We do not recommend running Beta plugins on production servers.
+
 Installing a plugin
 ~~~~~~~~~~~~~~~~
 

source/administration/upgrade.rst

@@ -16,6 +16,9 @@ Read these instructions carefully from start to finish. Make sure that you under
 
 .. important::
   Review the :doc:`important-upgrade-notes` to make sure you are aware of any actions you need to take before or after upgrading from your particular version.
+  
+.. important::
+  If you're upgrading from a version prior to v5.0 be sure to also modify your service file to work with the binary changes introduced with 5.0. Your execution directory should point to the Mattermost base directory (i.e. `/opt/mattermost`) and your binary should point to the `mattermost` binary (i.e. `/opt/mattermost/bin/mattermost`).
 
 You should gather the following information before starting the upgrade:
 

source/guides/core.rst

@@ -26,18 +26,7 @@ Development Process
 Release Process
 -------------------
 
-.. toctree::
-   :maxdepth: 2
-   :glob:
-
-   /process/release-faq*
-   /process/feature-release*
-   /process/bug-fix-release*
-   /process/dot-release*
-   /process/security-release*
-   /process/mobile-release*
-   /process/release-tips*
-   /process/release-scorecard-definitions*
+This section has moved to the `Mattermost Handbook <https://handbook.mattermost.com/operations/research-and-development/product/release-process>`__.
 
 Community Process
 -------------------

source/help/messaging/sending-messages.rst

@@ -13,7 +13,10 @@ Write a message by typing into the text input box, then press ENTER to send it.
 Replying to Messages
 ---------------------
 
-Click the reply link (arrow icon that appears when hovering over a message) next to any message. This keeps conversations organized in threads. Replies are indented slightly in the center pane to indicate that they are child messages of a parent message.
+Hover over any message and click the reply link (arrow icon |replyarrow|). This organizes the conversation into a thread. Replies are indented slightly in the center pane to indicate that they are child messages of a parent message.
+
+.. |replyarrow| image:: ../../images/replyIcon.PNG
+   :alt: reply arrow
 
 Clicking the reply link will open a sidebar on the right-hand side. To expand the right-hand sidebar to its full width, click the expand/shrink icon with two arrows at the top of the sidebar. To shrink the right-hand sidebar to its original width, click the same expand/shrink icon.
 

source/help/settings/custom-emoji.rst

@@ -2,6 +2,8 @@
 Custom Emoji
 ------------------
 
+**Note:** If you cannot see the **Custom Emoji** option in the menu, then your System Administrator may have restricted access to certain users. Contact your System Administrator for help.
+
 Settings for Custom Emoji are accessible from the **Main Menu** by clicking the hamburger menu at the top of the channels sidebar. Clicking **Custom Emoji** opens a page where you can view existing Custom Emojis and create new ones.
 
 To create a Custom Emoji:
@@ -16,5 +18,3 @@ To create a Custom Emoji:
 Small, square pictures work best when selecting an image. The file can be any JPG, GIF, or PNG.
 
 After saving, your emoji will show up in the list of Custom Emoji. To add your Custom Emoji to a message, simply type ":" followed by your emoji name to bring it up in the emoji autocomplete. Other users on the site will also be able to see your emoji in the autocomplete, and will be able to use it in their own messages.
-
-Note: If you cannot see the **Custom Emoji** option in the menu, then your System Administrator may have restricted access to certain users. Contact your System Administrator for help.

source/help/settings/theme-colors.rst

@@ -149,3 +149,14 @@ One Dark
 
   {"sidebarBg":"#21252b","sidebarText":"#abb2bf","sidebarUnreadText":"#abb2bf","sidebarTextHoverBg":"#3a3f4b","sidebarTextActiveBorder":"#4d78cc","sidebarTextActiveColor":"#d7dae0","sidebarHeaderBg":"#282c34","sidebarHeaderTextColor":"#abb2bf","onlineIndicator":"#98c379","awayIndicator":"#d19a66","dndIndicator":"#be5046","mentionBj":"#98c379","mentionColor":"#ffffff","centerChannelBg":"#282c34","centerChannelColor":"#abb2bf","newMessageSeparator":"#c67add","linkColor":"#61afef","buttonBg":"#4d78cc","buttonColor":"#ffffff","errorTextColor":"#f44747","mentionHighlightBg":"#525a69","mentionHighlightLink":"#61afef","codeTheme":"monokai","mentionBg":"#98c379"}
 
+Discord Dark Theme
+^^^^^^^^^^^^^^^^^^
+
+.. image:: ../../images/discordDarkTheme.png
+  :alt: Discord Dark Theme
+
+`GitHub <https://github.com/danger89/mattermost-discord-dark>`_
+
+.. code-block:: none
+
+  {"sidebarBg":"#2f3136","sidebarText":"#ffffff","sidebarUnreadText":"#ffffff","sidebarTextHoverBg":"#33363c","sidebarTextActiveBorder":"#66cfa0","sidebarTextActiveColor":"#ffffff","sidebarHeaderBg":"#27292c","sidebarHeaderTextColor":"#ffffff","onlineIndicator":"#43b581","awayIndicator":"#faa61a","dndIndicator":"#f04747","mentionBg":"#6e84d2","mentionBj":"#6e84d2","mentionColor":"#ffffff","centerChannelBg":"#36393f","centerChannelColor":"#dddddd","newMessageSeparator":"#6e84d2","linkColor":"#2095e8","buttonBg":"#43b581","buttonColor":"#ffffff","errorTextColor":"#ff6461","mentionHighlightBg":"#3d414f","mentionHighlightLink":"#6e84d2","codeTheme":"monokai"}