diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-06-07 15:52:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-07 15:52:07 +0200 |
| commit | 3d262bfc8dc234b6d26bbdda34ffcce180cbb5a5 (patch) | |
| tree | 3708d24591b9d017eede75454542b189d6a2608f /app/diagnostics.go | |
| parent | 0ba0af889e3a71d6d5aeb4dd10279d5027d3d8cd (diff) | |
| download | chat-3d262bfc8dc234b6d26bbdda34ffcce180cbb5a5.tar.gz chat-3d262bfc8dc234b6d26bbdda34ffcce180cbb5a5.tar.bz2 chat-3d262bfc8dc234b6d26bbdda34ffcce180cbb5a5.zip | |
Relese5.0 merge master 20180607 (#8927)
* Add missing diagnostics (#8911)
* Update diagnostics.go
* Update diagnostics.go
* Fix push notification styling backwards compatibility (#8913)
Diffstat (limited to 'app/diagnostics.go')
| -rw-r--r-- | app/diagnostics.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index c1b3a015a..d833cdbec 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -250,6 +250,8 @@ func (a *App) trackConfig() { "isdefault_image_proxy_options": isDefault(*cfg.ServiceSettings.ImageProxyOptions, ""), "websocket_url": isDefault(*cfg.ServiceSettings.WebsocketURL, ""), "allow_cookies_for_subdomains": *cfg.ServiceSettings.AllowCookiesForSubdomains, + "enable_api_team_deletion": *cfg.ServiceSettings.EnableAPITeamDeletion, + "experimental_enable_hardened_mode": *cfg.ServiceSettings.ExperimentalEnableHardenedMode, }) a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{ @@ -263,6 +265,7 @@ func (a *App) trackConfig() { "restrict_public_channel_deletion": *cfg.TeamSettings.RestrictPublicChannelDeletion, "restrict_private_channel_deletion": *cfg.TeamSettings.RestrictPrivateChannelDeletion, "enable_open_server": *cfg.TeamSettings.EnableOpenServer, + "enable_user_deactivation": *cfg.TeamSettings.EnableUserDeactivation, "enable_custom_brand": *cfg.TeamSettings.EnableCustomBrand, "restrict_direct_message": *cfg.TeamSettings.RestrictDirectMessage, "max_notifications_per_channel": *cfg.TeamSettings.MaxNotificationsPerChannel, @@ -410,6 +413,7 @@ func (a *App) trackConfig() { "isdefault_nickname_attribute": isDefault(*cfg.LdapSettings.NicknameAttribute, model.LDAP_SETTINGS_DEFAULT_NICKNAME_ATTRIBUTE), "isdefault_id_attribute": isDefault(*cfg.LdapSettings.IdAttribute, model.LDAP_SETTINGS_DEFAULT_ID_ATTRIBUTE), "isdefault_position_attribute": isDefault(*cfg.LdapSettings.PositionAttribute, model.LDAP_SETTINGS_DEFAULT_POSITION_ATTRIBUTE), + "isdefault_login_id_attribute": isDefault(*cfg.LdapSettings.LoginIdAttribute, ""), "isdefault_login_field_name": isDefault(*cfg.LdapSettings.LoginFieldName, model.LDAP_SETTINGS_DEFAULT_LOGIN_FIELD_NAME), "isdefault_login_button_color": isDefault(*cfg.LdapSettings.LoginButtonColor, ""), "isdefault_login_button_border_color": isDefault(*cfg.LdapSettings.LoginButtonBorderColor, ""), @@ -525,7 +529,8 @@ func (a *App) trackConfig() { }) a.SendDiagnostic(TRACK_CONFIG_DISPLAY, map[string]interface{}{ - "experimental_timezone": *cfg.DisplaySettings.ExperimentalTimezone, + "experimental_timezone": *cfg.DisplaySettings.ExperimentalTimezone, + "isdefault_custom_url_schemes": len(*cfg.DisplaySettings.CustomUrlSchemes) != 0, }) a.SendDiagnostic(TRACK_CONFIG_TIMEZONE, map[string]interface{}{ |