diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-28 10:35:27 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-28 10:35:27 -0400 |
| commit | c180cdbd1cba584c6e74cae7042de2290b51feb6 (patch) | |
| tree | 19002d12a212d0bcc0e09d31410df548b93d77ef /model | |
| parent | 7225abddeefb569f1f2da739211d7797b63814a2 (diff) | |
| parent | c37d153ffb276e501660133de836a61eec25e544 (diff) | |
| download | chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.gz chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.bz2 chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.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/websocket_message.go | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go index deaae6db8..ba3a02d33 100644 --- a/model/config.go +++ b/model/config.go @@ -1002,6 +1002,7 @@ type TeamSettings struct { EnableTeamCreation *bool EnableUserCreation *bool EnableOpenServer *bool + EnableUserDeactivation *bool RestrictCreationToDomains string EnableCustomBrand *bool CustomBrandText *string @@ -1036,6 +1037,10 @@ func (s *TeamSettings) SetDefaults() { s.EnableCustomBrand = NewBool(false) } + if s.EnableUserDeactivation == nil { + s.EnableUserDeactivation = NewBool(false) + } + if s.CustomBrandText == nil { s.CustomBrandText = NewString(TEAM_SETTINGS_DEFAULT_CUSTOM_BRAND_TEXT) } diff --git a/model/websocket_message.go b/model/websocket_message.go index 071975d6c..31b16d1a7 100644 --- a/model/websocket_message.go +++ b/model/websocket_message.go @@ -14,8 +14,9 @@ const ( WEBSOCKET_EVENT_POSTED = "posted" WEBSOCKET_EVENT_POST_EDITED = "post_edited" WEBSOCKET_EVENT_POST_DELETED = "post_deleted" - WEBSOCKET_EVENT_CHANNEL_DELETED = "channel_deleted" + WEBSOCKET_EVENT_CHANNEL_CONVERTED = "channel_converted" WEBSOCKET_EVENT_CHANNEL_CREATED = "channel_created" + WEBSOCKET_EVENT_CHANNEL_DELETED = "channel_deleted" WEBSOCKET_EVENT_CHANNEL_UPDATED = "channel_updated" WEBSOCKET_EVENT_CHANNEL_MEMBER_UPDATED = "channel_member_updated" WEBSOCKET_EVENT_DIRECT_ADDED = "direct_added" |