diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-12 14:22:05 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-12 14:22:05 -0700 |
| commit | 191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6 (patch) | |
| tree | 63378d3100f0a70806767c87886b3e0b9037f8c5 /api | |
| parent | 246c7414bd2f22a3440af5df7d72f33e7207dc50 (diff) | |
| parent | a6a3c351a828441313e90c1ac8e6afbfadad1f7c (diff) | |
| download | chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.tar.gz chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.tar.bz2 chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.zip | |
Merge pull request #1022 from mattermost/release-1.1.0
Release 1.1.0rc merging to master
Diffstat (limited to 'api')
| -rw-r--r-- | api/admin.go | 2 | ||||
| -rw-r--r-- | api/templates/email_change_verify_body.html | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/api/admin.go b/api/admin.go index 2167868e0..cd1e5d2de 100644 --- a/api/admin.go +++ b/api/admin.go @@ -104,6 +104,8 @@ func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) { return } + cfg.SetDefaults() + if err := cfg.IsValid(); err != nil { c.Err = err return diff --git a/api/templates/email_change_verify_body.html b/api/templates/email_change_verify_body.html index 1e1bcc22d..a9b2a0741 100644 --- a/api/templates/email_change_verify_body.html +++ b/api/templates/email_change_verify_body.html @@ -9,7 +9,7 @@ <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> <td style="padding: 20px 20px 10px; text-align:left;"> - <img src="{{.Props.SiteURL}}/static/images/{{.ClientProps.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> + <img src="{{.Props.SiteURL}}/static/images/logo-email.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> <tr> |