Joram Wilander 097289f8e4 Merge 3.6.2 into master (#5211) ...

* Add webhook cache

* Add channel by name cache

* Fxing profiles in channels cache

* Fix merge

2017-01-27 14:07:34 -05:00

..

account_migration.go

Adding migration support to LDAP from other account types (#3655)

2016-07-26 17:39:51 -04:00

brand.go

Add custom branding functionality (#2667)

2016-04-11 13:45:03 -04:00

cluster.go

Merge 3.6.2 into master (#5211)

2017-01-27 14:07:34 -05:00

compliance.go

PLT-2115 Adding compliance

2016-03-15 18:27:45 -07:00

emoji.go

PLT-3145 Custom Emojis (#3381)

2016-07-05 11:58:18 -04:00

ldap.go

Adding LDAP test connection button. Reordering LDAP settings. (#3912)

2016-09-01 17:05:20 -04:00

metrics.go

Adding metrics to cache for profile by ids api (#4925)

2017-01-03 11:57:38 -03:00

mfa.go

EE: PLT-4512 Show secret in addition to QR code when activating MFA (#4427)

2016-11-03 10:41:11 -04:00

oauthproviders.go

Some refactoring

2015-12-16 17:30:15 -05:00

saml.go

SAML support (#3494)

2016-07-05 15:49:00 -04:00