Merge remote-tracking branch 'upstream/master' into PLT-637

Conflicts:
	web/react/utils/constants.jsx

web/react/utils/constants.jsx

@@ -17,6 +17,7 @@ module.exports = {
 
         RECIEVED_POSTS: null,
         RECIEVED_POST: null,
+        RECIEVED_EDIT_POST: null,
         RECIEVED_SEARCH: null,
         RECIEVED_POST_SELECTED: null,
         RECIEVED_MENTION_DATA: null,
@@ -290,5 +291,14 @@ module.exports = {
     Preferences: {
         CATEGORY_DIRECT_CHANNEL_SHOW: 'direct_channel_show',
         CATEGORY_DISPLAY_SETTINGS: 'display_settings'
+    },
+    KeyCodes: {
+        UP: 38,
+        DOWN: 40,
+        LEFT: 37,
+        RIGHT: 39,
+        BACKSPACE: 8,
+        ENTER: 13,
+        ESCAPE: 27
     }
 };

web/react/utils/markdown.jsx

@@ -32,7 +32,7 @@ export class MattermostMarkdownRenderer extends marked.Renderer {
     link(href, title, text) {
         let outHref = href;
 
-        if (outHref.lastIndexOf('http', 0) !== 0) {
+        if (!(/^(mailto|https?|ftp)/.test(outHref))) {
             outHref = `http://${outHref}`;
         }
 

web/react/utils/text_formatting.jsx

@@ -89,7 +89,7 @@ function autolinkUrls(text, tokens) {
 
         if (match.getType() === 'email') {
             url = `mailto:${url}`;
-        } else if (url.lastIndexOf('http', 0) !== 0) {
+        } else if (!(/^(mailto|https?|ftp)/.test(url))) {
             url = `http://${url}`;
         }
 

web/react/utils/utils.jsx

@@ -474,6 +474,10 @@ export function applyTheme(theme) {
         changeCss('.date-separator .separator__text, .new-separator .separator__text', 'background:' + theme.centerChannelBg, 1);
         changeCss('.post-image__column .post-image__details', 'background:' + theme.centerChannelBg, 1);
         changeCss('.sidebar--right, .dropdown-menu, .popover', 'background:' + theme.centerChannelBg, 1);
+        changeCss('.popover.bottom>.arrow:after', 'border-bottom-color:' + theme.centerChannelBg, 1);
+        changeCss('.popover.right>.arrow:after', 'border-right-color:' + theme.centerChannelBg, 1);
+        changeCss('.popover.left>.arrow:after', 'border-left-color:' + theme.centerChannelBg, 1);
+        changeCss('.popover.top>.arrow:after', 'border-top-color:' + theme.centerChannelBg, 1);
         changeCss('.search-bar__container .search__form .search-bar, .form-control', 'background:' + theme.centerChannelBg, 1);
     }
 
@@ -918,6 +922,18 @@ export function isBrowserEdge() {
     return window.naviagtor && navigator.userAgent && navigator.userAgent.toLowerCase().indexOf('edge') > -1;
 }
 
+export function getDirectChannelName(id, otherId) {
+    let handle;
+
+    if (otherId > id) {
+        handle = id + '__' + otherId;
+    } else {
+        handle = otherId + '__' + id;
+    }
+
+    return handle;
+}
+
 // Used to get the id of the other user from a DM channel
 export function getUserIdFromChannelName(channel) {
     var ids = channel.name.split('__');