diff options
| author | Chris Duarte <csduarte@users.noreply.github.com> | 2017-11-21 07:45:41 -0800 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-11-21 10:45:41 -0500 |
| commit | cfa09ce0ef1877f6d7404f681414fa300503ea6c (patch) | |
| tree | e54fd6fba17e5684a57c178d4d0be13dd8e74385 | |
| parent | fdba2d50fd431796e49cef00484de410b7a7a350 (diff) | |
| download | chat-cfa09ce0ef1877f6d7404f681414fa300503ea6c.tar.gz chat-cfa09ce0ef1877f6d7404f681414fa300503ea6c.tar.bz2 chat-cfa09ce0ef1877f6d7404f681414fa300503ea6c.zip | |
Hide pre-release features section of advanced settings pane. (#7847)
| -rw-r--r-- | config/default.json | 3 | ||||
| -rw-r--r-- | model/config.go | 1 | ||||
| -rw-r--r-- | utils/config.go | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/config/default.json b/config/default.json index a78b93f36..bb9644d45 100644 --- a/config/default.json +++ b/config/default.json @@ -51,7 +51,8 @@ "EnableUserTypingMessages": true, "EnableChannelViewedMessages": true, "EnableUserStatuses": true, - "ClusterLogTimeoutMilliseconds": 2000 + "ClusterLogTimeoutMilliseconds": 2000, + "EnablePreviewFeatures": true }, "TeamSettings": { "SiteName": "Mattermost", diff --git a/model/config.go b/model/config.go index 923de3ba7..5b52767ca 100644 --- a/model/config.go +++ b/model/config.go @@ -205,6 +205,7 @@ type ServiceSettings struct { EnableUserStatuses *bool ClusterLogTimeoutMilliseconds *int CloseUnusedDirectMessages *bool + EnablePreviewFeatures *bool } func (s *ServiceSettings) SetDefaults() { diff --git a/utils/config.go b/utils/config.go index 1dea32535..25e684411 100644 --- a/utils/config.go +++ b/utils/config.go @@ -489,6 +489,7 @@ func getClientConfig(c *model.Config) map[string]string { props["AllowEditPost"] = *c.ServiceSettings.AllowEditPost props["PostEditTimeLimit"] = fmt.Sprintf("%v", *c.ServiceSettings.PostEditTimeLimit) props["CloseUnusedDirectMessages"] = strconv.FormatBool(*c.ServiceSettings.CloseUnusedDirectMessages) + props["EnablePreviewFeatures"] = strconv.FormatBool(*c.ServiceSettings.EnablePreviewFeatures) props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications) props["SendPushNotifications"] = strconv.FormatBool(*c.EmailSettings.SendPushNotifications) |