Merge branch 'master' of https://github.com/mattermost/platform into plt-375

Conflicts:
	web/react/components/user_settings/user_settings_appearance.jsx

1 files changed, 23 insertions, 1 deletions

diff --git a/api/admin.go b/api/admin.go
index 3ef8c12a8..d9714d6d2 100644
--- a/api/admin.go
+++ b/api/admin.go
@@ -23,8 +23,10 @@ func InitAdmin(r *mux.Router) {
 	sr.Handle("/logs", ApiUserRequired(getLogs)).Methods("GET")
 	sr.Handle("/config", ApiUserRequired(getConfig)).Methods("GET")
 	sr.Handle("/save_config", ApiUserRequired(saveConfig)).Methods("POST")
-	sr.Handle("/client_props", ApiAppHandler(getClientProperties)).Methods("GET")
 	sr.Handle("/test_email", ApiUserRequired(testEmail)).Methods("POST")
+	sr.Handle("/client_props", ApiAppHandler(getClientProperties)).Methods("GET")
+	sr.Handle("/log_client", ApiAppHandler(logClient)).Methods("POST")
+
 }
 
 func getLogs(c *Context, w http.ResponseWriter, r *http.Request) {
@@ -59,6 +61,26 @@ func getClientProperties(c *Context, w http.ResponseWriter, r *http.Request) {
 	w.Write([]byte(model.MapToJson(utils.ClientProperties)))
 }
 
+func logClient(c *Context, w http.ResponseWriter, r *http.Request) {
+	m := model.MapFromJson(r.Body)
+
+	lvl := m["level"]
+	msg := m["message"]
+
+	if len(msg) > 400 {
+		msg = msg[0:399]
+	}
+
+	if lvl == "ERROR" {
+		err := model.NewAppError("client", msg, "")
+		c.LogError(err)
+	}
+
+	rm := make(map[string]string)
+	rm["SUCCESS"] = "true"
+	w.Write([]byte(model.MapToJson(rm)))
+}
+
 func getConfig(c *Context, w http.ResponseWriter, r *http.Request) {
 	if !c.HasSystemAdminPermissions("getConfig") {
 		return