diff options
| author | George Goldberg <george@gberg.me> | 2018-03-19 10:53:37 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-19 10:53:37 +0000 |
| commit | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (patch) | |
| tree | 4b791b279109a10a66b62aaeeeae3d5243d2961b /utils/config.go | |
| parent | fadcdd271a68b38571b75d1d38ab023f940ac83a (diff) | |
| parent | 4b675b347b5241def7807fab5e01ce9b98531815 (diff) | |
| download | chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.tar.gz chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.tar.bz2 chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 8e9bafc6e..8befef94d 100644 --- a/utils/config.go +++ b/utils/config.go @@ -449,6 +449,9 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L hasImageProxy := c.ServiceSettings.ImageProxyType != nil && *c.ServiceSettings.ImageProxyType != "" && c.ServiceSettings.ImageProxyURL != nil && *c.ServiceSettings.ImageProxyURL != "" props["HasImageProxy"] = strconv.FormatBool(hasImageProxy) + props["EnableThemeSelection"] = "true" + props["AllowCustomThemes"] = "true" + if license != nil { props["ExperimentalTownSquareIsReadOnly"] = strconv.FormatBool(*c.TeamSettings.ExperimentalTownSquareIsReadOnly) props["ExperimentalEnableAuthenticationTransfer"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableAuthenticationTransfer) |