From 7e444dfd88d117df5b5a6ea589c233f71331e2ff Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Tue, 20 Mar 2018 13:19:34 -0500
Subject: add config for saml home realm discovery bypass (#8480)

---
 model/config.go | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'model/config.go')

diff --git a/model/config.go b/model/config.go
index 98e331f10..cf26c4205 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1291,6 +1291,9 @@ type SamlSettings struct {
 	IdpDescriptorUrl            *string
 	AssertionConsumerServiceURL *string
 
+	ScopingIDPProviderId *string
+	ScopingIDPName       *string
+
 	IdpCertificateFile    *string
 	PublicCertificateFile *string
 	PrivateKeyFile        *string
-- 
cgit v1.2.3-1-g7c22


From 74e703f58daff2aded07a969410f988cff9ada9b Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Thu, 22 Mar 2018 06:53:43 -0700
Subject: Timezone feature (#8185)

* Add supported timezones into config

Remove Timezone list creation in favor of timezone from configs

Add Timezone field to Users table

Clean up format of SupportedTimezones in config

* Remove unwanted change

* Add test for updating user timezone

* Add empty map[string]string if Timezone is null

* Add EnableTimezoneSelection config

* Revert back to map[string]string for ClientConfig

* Refactor SupportedTimezones into timezones.json

* Include timezones.json in TestConfigFlag

* Add timezone api endpoint

* Bump varchar size to 256 and setMaxSize in user_store

* Refactor LoadConfig to LoadConfig and LoadTimezoneConfig

* Remove unnecessary argument in LoadConfig, mail_test

* Add test for timezone endpoint

* Add license header

* Refactor timezones endpoint to system.go

* Add system base route to timezone endpoint

* db timezone upgrade in db v4.9

* Avoid saving SupportedTimezones to config.json

* Add timezonePath support in config

* Remove EnableTimezoneSelection from config

* Use return statement without return parameter

* Refactor test for SupportedTimezones

* Check for supportedTimezone != nil instead of using len

* Decouple SupportedTimezones out of Config

* Fix failing test

* Add LastTeamIconUpdate back in upgrade.go

* Write timezone config in config_flag_test

* Add code fallback for default timezone support
---
 model/config.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'model/config.go')

diff --git a/model/config.go b/model/config.go
index cf26c4205..4e13ca16e 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1700,6 +1700,16 @@ func (s *MessageExportSettings) SetDefaults() {
 	}
 }
 
+type TimezoneSettings struct {
+	SupportedTimezonesPath *string
+}
+
+func (s *TimezoneSettings) SetDefaults() {
+	if s.SupportedTimezonesPath == nil {
+		s.SupportedTimezonesPath = NewString("timezones.json")
+	}
+}
+
 type ConfigFunc func() *Config
 
 type Config struct {
@@ -1733,6 +1743,7 @@ type Config struct {
 	MessageExportSettings MessageExportSettings
 	JobSettings           JobSettings
 	PluginSettings        PluginSettings
+	TimezoneSettings      TimezoneSettings
 }
 
 func (o *Config) Clone() *Config {
@@ -1802,6 +1813,7 @@ func (o *Config) SetDefaults() {
 	o.JobSettings.SetDefaults()
 	o.WebrtcSettings.SetDefaults()
 	o.MessageExportSettings.SetDefaults()
+	o.TimezoneSettings.SetDefaults()
 }
 
 func (o *Config) IsValid() *AppError {
-- 
cgit v1.2.3-1-g7c22