diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-25 11:25:40 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-25 11:25:40 -0400 |
| commit | baf697e348e329ad6b5c5bba1db8e0a53fcb8a13 (patch) | |
| tree | 88acbcb69382817eb07f8c331beb195d014cdfa4 /utils/config.go | |
| parent | a51b2367a34d5cbefe720232b35ccf0d1aa63c98 (diff) | |
| parent | 58abb4204e2e5d7c82312ed18a3d4d1a3a5f1962 (diff) | |
| download | chat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.tar.gz chat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.tar.bz2 chat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 9a606389d..0da1d0abe 100644 --- a/utils/config.go +++ b/utils/config.go @@ -556,6 +556,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["RunJobs"] = strconv.FormatBool(*c.JobSettings.RunJobs) // Set default values for all options that require a license. + props["ExperimentalHideTownSquareinLHS"] = "false" props["ExperimentalTownSquareIsReadOnly"] = "false" props["ExperimentalEnableAuthenticationTransfer"] = "true" props["EnableCustomBrand"] = "false" @@ -611,6 +612,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["PasswordRequireSymbol"] = strconv.FormatBool(*c.PasswordSettings.Symbol) if license != nil { + props["ExperimentalHideTownSquareinLHS"] = strconv.FormatBool(*c.TeamSettings.ExperimentalHideTownSquareinLHS) props["ExperimentalTownSquareIsReadOnly"] = strconv.FormatBool(*c.TeamSettings.ExperimentalTownSquareIsReadOnly) props["ExperimentalEnableAuthenticationTransfer"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableAuthenticationTransfer) |