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 /model | |
| 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 'model')
| -rw-r--r-- | model/config.go | 5 | ||||
| -rw-r--r-- | model/user.go | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go index 7c11860d2..deaae6db8 100644 --- a/model/config.go +++ b/model/config.go @@ -1022,6 +1022,7 @@ type TeamSettings struct { EnableConfirmNotificationsToChannel *bool TeammateNameDisplay *string ExperimentalEnableAutomaticReplies *bool + ExperimentalHideTownSquareinLHS *bool ExperimentalTownSquareIsReadOnly *bool ExperimentalPrimaryTeam *string } @@ -1120,6 +1121,10 @@ func (s *TeamSettings) SetDefaults() { s.ExperimentalEnableAutomaticReplies = NewBool(false) } + if s.ExperimentalHideTownSquareinLHS == nil { + s.ExperimentalHideTownSquareinLHS = NewBool(false) + } + if s.ExperimentalTownSquareIsReadOnly == nil { s.ExperimentalTownSquareIsReadOnly = NewBool(false) } diff --git a/model/user.go b/model/user.go index 6fbdb09e8..c5d6c13b6 100644 --- a/model/user.go +++ b/model/user.go @@ -22,7 +22,6 @@ const ( USER_NOTIFY_NONE = "none" DESKTOP_NOTIFY_PROP = "desktop" DESKTOP_SOUND_NOTIFY_PROP = "desktop_sound" - DESKTOP_DURATION_NOTIFY_PROP = "desktop_duration" MARK_UNREAD_NOTIFY_PROP = "mark_unread" PUSH_NOTIFY_PROP = "push" PUSH_STATUS_NOTIFY_PROP = "push_status" |