From 9481a4f0ef753499c1d02e3be99a7c59c5467ab6 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 11 Jul 2016 14:21:51 -0400 Subject: Merge release 3.2 into master (#3548) * Bumping version to: 3.2.0-rc1 * PLT-2863 fixing bad merge that broke this PR (#3523) * PLT-2863 adding remove user from team * PLT-2863 adding the client side UI * Fixing trailing space * Fixing reported issues * Adding documentatino * Switching to final javascript driver * Fixing bad merge * Fixing bad merge * PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled (#3524) * Login error messages fix (#3525) * daily translations 20160708 (#3533) * Fixed permissions when getting a file attachment to use the correct user id (#3535) * PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML (#3534) * PLT-3560 blocking adding to channel once user is removed (#3537) * Always allow system admins to see the Integrations sidebar (#3536) * Plt 3475 - Post control improvements (#3538) * Adding class to post when dropdown is active. * plt-3475 - Post controls improvements * daily translations 20160711 (#3544) --- webapp/components/admin_console/saml_settings.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webapp/components/admin_console/saml_settings.jsx') diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx index 45135fba6..611c37192 100644 --- a/webapp/components/admin_console/saml_settings.jsx +++ b/webapp/components/admin_console/saml_settings.jsx @@ -166,7 +166,7 @@ export default class SamlSettings extends AdminSettings { } uploadingText={Utils.localizeMessage('admin.saml.uploading.certificate', 'Uploading Certificate...')} disabled={!this.state.enable} - fileType='.crt' + fileType='.crt,.cer' onSubmit={this.uploadCertificate} /> ); @@ -260,7 +260,7 @@ export default class SamlSettings extends AdminSettings { } uploadingText={Utils.localizeMessage('admin.saml.uploading.certificate', 'Uploading Certificate...')} disabled={!this.state.enable || !this.state.encrypt} - fileType='.crt' + fileType='.crt,.cer' onSubmit={this.uploadCertificate} /> ); -- cgit v1.2.3-1-g7c22