Merge branch 'master' of https://github.com/mattermost/platform into bug-fixes

NOTICE.txt

@@ -724,6 +724,46 @@ Legal Terms
   Our home page can be found at
 
     http://www.freetype.org
-
-
+    
 --- end of FTL.TXT ---
+    
+---
+
+This product contains a modified portion of 'gemoji', a collection of emoji images and names by Apple Inc. and other contributors.
+
+* HOMEPAGE: 
+  * https://github.com/github/gemoji/blob/master/LICENSE
+  
+* LICENSE: 
+
+octocat, squirrel, shipit
+Copyright (c) 2013 GitHub Inc. All rights reserved.
+
+bowtie, neckbeard, fu
+Copyright (c) 2013 37signals, LLC. All rights reserved.
+
+feelsgood, finnadie, goberserk, godmode, hurtrealbad, rage 1-4, suspect
+Copyright (c) 2013 id Software. All rights reserved.
+
+trollface
+Copyright (c) 2013 whynne@deviantart. All rights reserved.
+
+All other images
+Copyright (c) 2013 Apple Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software 
+without restriction, including without limitation the rights to use, copy, modify, 
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject to the following 
+conditions:
+
+The above copyright notice and this permission notice shall be included in all copies 
+or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+DEALINGS IN THE SOFTWARE.

mattermost.go

@@ -325,10 +325,10 @@ Usage:
 
     -role="admin"                     The role used in other commands
                                       valid values are
-                                        "" - The empty role is basic user 
+                                        "" - The empty role is basic user
                                            permissions
                                         "admin" - Represents a team admin and
-                                           is used to help adminsiter one team.
+                                           is used to help administer one team.
                                         "system_admin" - Represents a system
                                            admin who has access to all teams
                                            and configuration settings.  This

web/react/utils/constants.jsx

@@ -182,7 +182,7 @@ module.exports = {
         },
         {
             id: 'sidebarText',
-            uiName: 'Sidebar text color'
+            uiName: 'Sidebar Text'
         },
         {
             id: 'sidebarHeaderBg',
@@ -190,51 +190,51 @@ module.exports = {
         },
         {
             id: 'sidebarHeaderTextColor',
-            uiName: 'Sidebar Header text color'
+            uiName: 'Sidebar Header Text'
         },
         {
             id: 'sidebarUnreadText',
-            uiName: 'Sidebar unread text color'
+            uiName: 'Sidebar Unread Text'
         },
         {
             id: 'sidebarTextHoverBg',
-            uiName: 'Sidebar text hover BG'
+            uiName: 'Sidebar Text Hover BG'
         },
         {
             id: 'sidebarTextHoverColor',
-            uiName: 'Sidebar text hover color'
+            uiName: 'Sidebar Text Hover Color'
         },
         {
             id: 'sidebarTextActiveBg',
-            uiName: 'Sidebar text active BG'
+            uiName: 'Sidebar Text Active BG'
         },
         {
             id: 'sidebarTextActiveColor',
-            uiName: 'Sidebar text active color'
+            uiName: 'Sidebar Text Active Color'
         },
         {
             id: 'onlineIndicator',
-            uiName: 'Online indicator'
+            uiName: 'Online Indicator'
         },
         {
             id: 'mentionBj',
-            uiName: 'Mention jewel BG'
+            uiName: 'Mention Jewel BG'
         },
         {
             id: 'mentionColor',
-            uiName: 'Mention jewel text color'
+            uiName: 'Mention Jewel Text'
         },
         {
             id: 'centerChannelBg',
-            uiName: 'Center channel BG'
+            uiName: 'Center Channel BG'
         },
         {
             id: 'centerChannelColor',
-            uiName: 'Center channel text color'
+            uiName: 'Center Channel Text'
         },
         {
             id: 'linkColor',
-            uiName: 'Link color'
+            uiName: 'Link Color'
         },
         {
             id: 'buttonBg',
@@ -243,7 +243,7 @@ module.exports = {
 
         {
             id: 'buttonColor',
-            uiName: 'Button Color'
+            uiName: 'Button Text'
         }
     ]
 };