Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

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)
 	}

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"