diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
| commit | 2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160 (patch) | |
| tree | d5bf8318dc82d96cd34b83481e1cc5c8289d170a /api | |
| parent | 9e04909c0a3672d27c148c931d82b225cc86dfe5 (diff) | |
| parent | 0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff) | |
| download | chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.gz chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.bz2 chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.zip | |
Merge branch 'master' into PLT-11-email
Diffstat (limited to 'api')
| -rw-r--r-- | api/post.go | 2 | ||||
| -rw-r--r-- | api/user.go | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/api/post.go b/api/post.go index 4294ae03c..0379f6af5 100644 --- a/api/post.go +++ b/api/post.go @@ -160,7 +160,7 @@ func fireAndForgetNotifications(post *model.Post, teamId, siteURL string) { channel = result.Data.(*model.Channel) if channel.Type == model.CHANNEL_DIRECT { bodyText = "You have one new message." - subjectText = "New Private Message" + subjectText = "New Direct Message" } else { bodyText = "You have one new mention." subjectText = "New Mention" diff --git a/api/user.go b/api/user.go index d61afb027..5bb65e2ed 100644 --- a/api/user.go +++ b/api/user.go @@ -171,9 +171,6 @@ func CreateUser(c *Context, team *model.Team, user *model.User) *model.User { } user.MakeNonNil() - if len(user.Props["theme"]) == 0 { - user.AddProp("theme", utils.Cfg.TeamSettings.DefaultThemeColor) - } if result := <-Srv.Store.User().Save(user); result.Err != nil { c.Err = result.Err |