From c3e9c414408a8c9c2806af12e659e395c605496f Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Mon, 28 May 2018 16:20:08 +0200 Subject: [MM-1915] Add Deactivate Account - server side (#8699) --- model/config.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'model') 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) } -- cgit v1.2.3-1-g7c22 From c37d153ffb276e501660133de836a61eec25e544 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Mon, 28 May 2018 22:31:08 +0800 Subject: [MM-10519] Send websocket event whenever the channel has changed it's type (public|private) (#8798) * send websocket event whenever the channel has changed it's type (public|private) * updated per comment Signed-off-by: Saturnino Abril * add channel_converted websocket event Signed-off-by: Saturnino Abril * only send channel_id via websocket message for "channel_converted" event Signed-off-by: Saturnino Abril --- model/websocket_message.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'model') 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" -- cgit v1.2.3-1-g7c22