From 61f92517f317f4b3f437b8db48f31c569ceb5f2d Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Fri, 9 Oct 2015 12:24:39 -0700
Subject: PLT-586 fixing issues with security alert

---
 api/admin.go | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'api')

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
-- 
cgit v1.2.3-1-g7c22


From 3a3b24e6be868bda6d80e5384f5bb09abe1f9b6e Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Fri, 9 Oct 2015 13:44:20 -0700
Subject: Replaced change email verification email logo image with a static
 link

---
 api/templates/email_change_verify_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'api')

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>
-- 
cgit v1.2.3-1-g7c22


From e5a019390d91890bd098511f4845e27ff7bda430 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Fri, 9 Oct 2015 16:45:40 -0400
Subject: Fixed download links in Safari

---
 api/file.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'api')

diff --git a/api/file.go b/api/file.go
index 9ebcd821b..429347596 100644
--- a/api/file.go
+++ b/api/file.go
@@ -408,11 +408,11 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Length", strconv.Itoa(len(f)))
 	w.Header().Del("Content-Type") // Content-Type will be set automatically by the http writer
 
-	// attach extra headers to trigger a download on IE and Edge
+	// attach extra headers to trigger a download on IE, Edge, and Safari
 	ua := user_agent.New(r.UserAgent())
 	bname, _ := ua.Browser()
 
-	if bname == "Edge" || bname == "Internet Explorer" {
+	if bname == "Edge" || bname == "Internet Explorer" || bname == "Safari" {
 		// trim off anything before the final / so we just get the file's name
 		parts := strings.Split(filename, "/")
 
-- 
cgit v1.2.3-1-g7c22