From ca8efc66c31ad2d5067aaca68684386bd1a479f0 Mon Sep 17 00:00:00 2001 From: esethna Date: Thu, 24 Sep 2015 13:32:27 -0600 Subject: [PATCH 1/7] 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 f314724772..6e9ad7699f 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 --- From 737e48dce3dc8d839d0914f6614ae86e5ee545a1 Mon Sep 17 00:00:00 2001 From: esethna Date: Thu, 24 Sep 2015 14:01:46 -0600 Subject: [PATCH 2/7] 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 6e9ad7699f..dafc6d257e 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 --- From 7bb384b92dd7c0eb17f4037f5db872dc8b817dd9 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Thu, 24 Sep 2015 16:47:27 -0400 Subject: [PATCH 3/7] Added a json response to the uploadProfileImage api call --- api/user.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/user.go b/api/user.go index 3cce3cdd34..406f1985b3 100644 --- a/api/user.go +++ b/api/user.go @@ -821,6 +821,9 @@ func uploadProfileImage(c *Context, w http.ResponseWriter, r *http.Request) { Srv.Store.User().UpdateLastPictureUpdate(c.Session.UserId) c.LogAudit("") + + // write something as the response since jQuery expects a json response + w.Write([]byte("true")) } func updateUser(c *Context, w http.ResponseWriter, r *http.Request) { From 73e5ce1a66a1bbe18ae73837a770f4e6b1b3e70c Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Fri, 25 Sep 2015 09:34:26 +0800 Subject: [PATCH 4/7] 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 4608bfff3e..ff7b0f3f3a 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 From 84763e9bde1293fe5ff909e268debc46bb199d89 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 25 Sep 2015 08:19:05 -0400 Subject: [PATCH 5/7] Added welcome email back in. --- api/templates/signup_team_body.html | 3 --- api/templates/welcome_body.html | 12 +++--------- api/templates/welcome_subject.html | 2 +- api/user.go | 12 ++++-------- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html index f5c0e62b04..e6ffb3a5bf 100644 --- a/api/templates/signup_team_body.html +++ b/api/templates/signup_team_body.html @@ -22,9 +22,6 @@ Set up your team

{{ .ClientProps.SiteName }} is one place for all your team communication, searchable and available anywhere.
You'll get more out of {{ .ClientProps.SiteName }} when your team is in constant communication--let's get them on board.

-

- Learn more by taking a tour -

diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html index c75e14c6ac..5fe3450b72 100644 --- a/api/templates/welcome_body.html +++ b/api/templates/welcome_body.html @@ -17,15 +17,9 @@ - - -
-

You joined the {{.Props.TeamDisplayName}} team at {{.ClientProps.SiteName}}!

-

Please let me know if you have any questions.
Enjoy your stay at {{.ClientProps.SiteName}}.

-
- Any questions at all, mail us any time: {{.ClientProps.FeedbackEmail}}.
- Best wishes,
- The {{.ClientProps.SiteName}} Team
+

You can sign-in to your new team from the web address:

+ {{.Props.TeamURL}} +

Mattermost lets you share messages and files from your PC or phone, with instant search and archiving.
diff --git a/api/templates/welcome_subject.html b/api/templates/welcome_subject.html index 2214f7a382..c3b70ef20f 100644 --- a/api/templates/welcome_subject.html +++ b/api/templates/welcome_subject.html @@ -1 +1 @@ -{{define "welcome_subject"}}Welcome to {{ .ClientProps.SiteName }}{{end}} \ No newline at end of file +{{define "welcome_subject"}}You joined {{ .Props.TeamDisplayName }}{{end}} diff --git a/api/user.go b/api/user.go index 3cce3cdd34..bbe6efb9fa 100644 --- a/api/user.go +++ b/api/user.go @@ -198,7 +198,7 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { l4g.Error("Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v", ruser.Id, ruser.TeamId, err) } - //fireAndForgetWelcomeEmail(ruser.FirstName, ruser.Email, team.Name, c.TeamURL+"/channels/town-square") + fireAndForgetWelcomeEmail(ruser.Email, team.DisplayName, c.GetTeamURLFromTeam(team)) if user.EmailVerified { if cresult := <-Srv.Store.User().VerifyEmail(ruser.Id); cresult.Err != nil { l4g.Error("Failed to set email verified err=%v", cresult.Err) @@ -218,17 +218,13 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { } } -func fireAndForgetWelcomeEmail(name, email, teamDisplayName, link, siteURL string) { +func fireAndForgetWelcomeEmail(email, teamDisplayName, teamURL string) { go func() { subjectPage := NewServerTemplatePage("welcome_subject") - subjectPage.Props["SiteURL"] = siteURL + subjectPage.Props["TeamDisplayName"] = teamDisplayName bodyPage := NewServerTemplatePage("welcome_body") - bodyPage.Props["SiteURL"] = siteURL - bodyPage.Props["Nickname"] = name - bodyPage.Props["TeamDisplayName"] = teamDisplayName - bodyPage.Props["FeedbackName"] = utils.Cfg.EmailSettings.FeedbackName - bodyPage.Props["TeamURL"] = link + bodyPage.Props["TeamURL"] = teamURL if err := utils.SendMail(email, subjectPage.Render(), bodyPage.Render()); err != nil { l4g.Error("Failed to send welcome email successfully err=%v", err) From b86833f0c589e2aef866ea095c1bac7fa8b9a0c3 Mon Sep 17 00:00:00 2001 From: mishimi Date: Fri, 25 Sep 2015 05:23:04 -0700 Subject: [PATCH 6/7] 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 90af9beda9..8c9e1ee85f 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' } ] }; From b03d8610de3b4e475c168522bc78e9ef857e64fb Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 25 Sep 2015 08:43:06 -0400 Subject: [PATCH 7/7] Fix acconut settings being scrolled to bottom when opened. --- web/react/components/user_settings/user_settings_appearance.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx index 7617f04d1e..4372069e70 100644 --- a/web/react/components/user_settings/user_settings_appearance.jsx +++ b/web/react/components/user_settings/user_settings_appearance.jsx @@ -81,6 +81,8 @@ export default class UserSettingsAppearance extends React.Component { $('#user_settings').off('hidden.bs.modal', this.handleClose); this.props.updateTab('general'); + $('.ps-container.modal-body').scrollTop(0); + $('.ps-container.modal-body').perfectScrollbar('update'); $('#user_settings').modal('hide'); }, (err) => {