From ca8efc66c31ad2d5067aaca68684386bd1a479f0 Mon Sep 17 00:00:00 2001 From: esethna Date: Thu, 24 Sep 2015 13:32:27 -0600 Subject: Update NOTICE.txt to include emoji license info V2 Added to the bottom of the file --- NOTICE.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/NOTICE.txt b/NOTICE.txt index f31472477..6e9ad7699 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -724,6 +724,43 @@ Legal Terms Our home page can be found at http://www.freetype.org + +--- + +This product contains a modified portion of emoji artwork by Apple Inc. and other contributors. + +* 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. --- end of FTL.TXT --- -- cgit v1.2.3-1-g7c22 From 737e48dce3dc8d839d0914f6614ae86e5ee545a1 Mon Sep 17 00:00:00 2001 From: esethna Date: Thu, 24 Sep 2015 14:01:46 -0600 Subject: Update NOTICE.txt to include emoji license info V3 Tweaked the license info as per chat with Ian --- NOTICE.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 6e9ad7699..dafc6d257 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -725,9 +725,14 @@ Legal Terms http://www.freetype.org +--- end of FTL.TXT --- + --- -This product contains a modified portion of emoji artwork by Apple Inc. and other contributors. +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: @@ -762,5 +767,3 @@ PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 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. - ---- end of FTL.TXT --- -- cgit v1.2.3-1-g7c22 From 73e5ce1a66a1bbe18ae73837a770f4e6b1b3e70c Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Fri, 25 Sep 2015 09:34:26 +0800 Subject: Fix a typo and trailing space: adminsiter -> administer Signed-off-by: Chengwei Yang --- mattermost.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mattermost.go b/mattermost.go index 4608bfff3..ff7b0f3f3 100644 --- a/mattermost.go +++ b/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 -- cgit v1.2.3-1-g7c22 From b86833f0c589e2aef866ea095c1bac7fa8b9a0c3 Mon Sep 17 00:00:00 2001 From: mishimi Date: Fri, 25 Sep 2015 05:23:04 -0700 Subject: PLT 381 In Theme Color settings, change the "Button Color" to "Button Text" Also made the following changes 1. Capitalize all words 2. Remove the word "color" if it comes after "text" Ex. Sidebar text color --> Sidebar Text --- web/react/utils/constants.jsx | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 90af9beda..8c9e1ee85 100644 --- a/web/react/utils/constants.jsx +++ b/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' } ] }; -- cgit v1.2.3-1-g7c22