Merge pull request #13 from rgarmsen2295/master

Remerge

10 files changed, 49 insertions, 19 deletions

diff --git a/NOTICE.txt b/NOTICE.txt
index 07c6a8bf4..fd5fc74b5 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,4 +1,11 @@
 Mattermost Platform Preview 
-Copyright 2015 SpinPunch, Inc. 
+© 2015 Spinpunch, Inc.  All Rights Reserved.  See LICENSE.txt for license information.
 
-Regular expression support is provided by the PCRE library package, which is open source software, written by Philip Hazel, and copyright by the University of Cambridge, England. The original software is available from      ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+NOTICES: 
+
+This product contains a modified portion of 'draw2d', a Go library to draw 2d geometrical forms on images by Laurent Le Goff
+
+* LICENSE: 
+  * http://opensource.org/licenses/BSD-3-Clause (BSD 3-Clause)
+* HOMEPAGE: 
+  * https://code.google.com/p/draw2d/
diff --git a/api/context.go b/api/context.go
index 16105c8af..501e4e77f 100644
--- a/api/context.go
+++ b/api/context.go
@@ -303,6 +303,10 @@ func IsTestDomain(r *http.Request) bool {
 		return true
 	}
 
+	if strings.Index(r.Host, "dockerhost") == 0 {
+		return true
+	}
+
 	if strings.Index(r.Host, "test") == 0 {
 		return true
 	}
diff --git a/config/config.json b/config/config.json
index 1b844c259..82e40a1c5 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,7 +1,7 @@
 {
     "LogSettings": {
-        "ConsoleEnable": false,
-        "ConsoleLevel": "DEBUG",
+        "ConsoleEnable": true,
+        "ConsoleLevel": "INFO",
         "FileEnable": true,
         "FileLevel": "INFO",
         "FileFormat": "",
diff --git a/config/config_docker.json b/config/config_docker.json
index f2e56bef8..a90722a1d 100644
--- a/config/config_docker.json
+++ b/config/config_docker.json
@@ -58,7 +58,7 @@
         "SMTPPassword": "",
         "SMTPServer": "localhost:25",
 		"UseTLS": false,
-        "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
+        "FeedbackEmail": "",
         "FeedbackName": "",
         "ApplePushServer": "",
         "ApplePushCertPublic": "",
diff --git a/model/utils.go b/model/utils.go
index 8b597000a..2541247de 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -160,6 +160,7 @@ var reservedDomains = []string{
 	"channel",
 	"internal",
 	"localhost",
+	"dockerhost",
 	"stag",
 	"post",
 	"cluster",
diff --git a/utils/config.go b/utils/config.go
index 418041706..23bd3e85a 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -6,6 +6,7 @@ package utils
 import (
 	l4g "code.google.com/p/log4go"
 	"encoding/json"
+	"net/mail"
 	"os"
 	"path/filepath"
 )
@@ -222,15 +223,20 @@ func LoadConfig(fileName string) {
 		config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN")
 	}
 
-	// Validates our mail settings
-	if err := CheckMailSettings(); err != nil {
-		l4g.Error("Email settings are not valid err=%v", err)
+	// Check for a valid email for feedback, if not then do feedback@domain
+	if _, err := mail.ParseAddress(config.EmailSettings.FeedbackEmail); err != nil {
+		config.EmailSettings.FeedbackEmail = "feedback@" + config.ServiceSettings.Domain
 	}
 
 	configureLog(config.LogSettings)
 
 	Cfg = &config
 	SanitizeOptions = getSanitizeOptions()
+
+	// Validates our mail settings
+	if err := CheckMailSettings(); err != nil {
+		l4g.Error("Email settings are not valid err=%v", err)
+	}
 }
 
 func getSanitizeOptions() map[string]bool {
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 55fc32c33..3079917ec 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -85,20 +85,22 @@ module.exports = React.createClass({
         var postFiles = [];
         var images = [];
         if (filenames) {
-            for (var i = 0; i < filenames.length && i < Constants.MAX_DISPLAY_FILES; i++) {
+            for (var i = 0; i < filenames.length; i++) {
                 var fileInfo = utils.splitFileLocation(filenames[i]);
                 if (Object.keys(fileInfo).length === 0) continue;
 
                 var type = utils.getFileType(fileInfo.ext);
 
                 if (type === "image") {
-                    postFiles.push(
-                        <div className="post-image__column" key={filenames[i]}>
-                            <a href="#" onClick={this.handleImageClick} data-img-id={images.length.toString()} data-toggle="modal" data-target={"#" + postImageModalId }><div ref={filenames[i]} className="post__load" style={{backgroundImage: 'url(/static/images/load.gif)'}}></div></a>
-                        </div>
-                    );
+                    if (i < Constants.MAX_DISPLAY_FILES) {
+                        postFiles.push(
+                            <div className="post-image__column" key={filenames[i]}>
+                                <a href="#" onClick={this.handleImageClick} data-img-id={images.length.toString()} data-toggle="modal" data-target={"#" + postImageModalId }><div ref={filenames[i]} className="post__load" style={{backgroundImage: 'url(/static/images/load.gif)'}}></div></a>
+                            </div>
+                        );
+                    }
                     images.push(filenames[i]);
-                } else {
+                } else if (i < Constants.MAX_DISPLAY_FILES) {
                     postFiles.push(
                         <div className="post-image__column custom-file" key={fileInfo.name}>
                             <a href={fileInfo.path+"."+fileInfo.ext} download={fileInfo.name+"."+fileInfo.ext}>
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index a9c2433f2..110634b50 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -1056,7 +1056,7 @@ var AppearanceTab = React.createClass({
 
                 themeSection = (
                     <SettingItemMax
-                        title="Theme"
+                        title="Theme Color"
                         inputs={inputs}
                         submit={this.submitTheme}
                         server_error={server_error}
@@ -1066,7 +1066,7 @@ var AppearanceTab = React.createClass({
             } else {
                 themeSection = (
                     <SettingItemMin
-                        title="Theme"
+                        title="Theme Color"
                         describe={this.state.theme}
                         updateSection={function(){self.props.updateSection("theme");}}
                     />
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 0a3b1db3d..deb07409b 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -61,6 +61,7 @@ module.exports = {
     "channel",
     "internal",
     "localhost",
+    "dockerhost",
     "stag",
     "post",
     "cluster",
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 628d92342..e57088614 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -28,6 +28,9 @@ module.exports.isTestDomain = function() {
     if ((/^localhost/).test(window.location.hostname))
         return true;
 
+    if ((/^dockerhost/).test(window.location.hostname))
+        return true;
+
     if ((/^test/).test(window.location.hostname))
         return true;
 
@@ -75,8 +78,14 @@ module.exports.getDomainWithOutSub = function() {
 
   var parts = window.location.host.split(".");
 
-  if (parts.length == 1)
-    return "localhost:8065";
+  if (parts.length == 1) {
+    if (parts[0].indexOf("dockerhost") > -1) {
+        return "dockerhost:8065";
+    }
+    else {
+        return "localhost:8065";
+    }
+  }
 
   return parts[1] + "." +  parts[2];
 }