From eb8a2e4fc8c609a83ee76f60557d116ae3324368 Mon Sep 17 00:00:00 2001
From: lfbrock <lfbrock@users.noreply.github.com>
Date: Wed, 12 Jul 2017 09:14:58 -0400
Subject: Update System Console mobile app links (#6909)

* Update push_settings.jsx

* Update en.json
---
 webapp/components/admin_console/push_settings.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'webapp/components/admin_console')

diff --git a/webapp/components/admin_console/push_settings.jsx b/webapp/components/admin_console/push_settings.jsx
index 5a2f6d89b..c0ce64f8a 100644
--- a/webapp/components/admin_console/push_settings.jsx
+++ b/webapp/components/admin_console/push_settings.jsx
@@ -129,14 +129,14 @@ export default class PushSettings extends AdminSettings {
             pushServerHelpText = (
                 <FormattedHTMLMessage
                     id='admin.email.mhpnsHelp'
-                    defaultMessage='Download <a href="https://itunes.apple.com/us/app/mattermost/id984966508?mt=8" target="_blank">Mattermost iOS app</a> from iTunes. Download <a href="https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en" target="_blank">Mattermost Android app</a> from Google Play. Learn more about the <a href="http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns" target="_blank">Mattermost Hosted Push Notification Service</a>.'
+                    defaultMessage='Download <a href="https://about.mattermost.com/mattermost-ios-app/" target="_blank">Mattermost iOS app</a> from iTunes. Download <a href="https://about.mattermost.com/mattermost-android-app/" target="_blank">Mattermost Android app</a> from Google Play. Learn more about the <a href="http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns" target="_blank">Mattermost Hosted Push Notification Service</a>.'
                 />
             );
         } else if (this.state.pushNotificationServerType === PUSH_NOTIFICATIONS_MTPNS) {
             pushServerHelpText = (
                 <FormattedHTMLMessage
                     id='admin.email.mtpnsHelp'
-                    defaultMessage='Download <a href="https://itunes.apple.com/us/app/mattermost/id984966508?mt=8" target="_blank">Mattermost iOS app</a> from iTunes. Download <a href="https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en" target="_blank">Mattermost Android app</a> from Google Play. Learn more about the <a href="http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns" target="_blank">Mattermost Test Push Notification Service</a>.'
+                    defaultMessage='Download <a href="https://about.mattermost.com/mattermost-ios-app/" target="_blank">Mattermost iOS app</a> from iTunes. Download <a href="https://about.mattermost.com/mattermost-android-app/" target="_blank">Mattermost Android app</a> from Google Play. Learn more about the <a href="http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns" target="_blank">Mattermost Test Push Notification Service</a>.'
                 />
             );
         } else {
-- 
cgit v1.2.3-1-g7c22


From 764ff4cb64eb86c87a28a076eed28d8778f194d6 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 13 Jul 2017 19:55:45 -0400
Subject: PLT-7116/PLT-7126 Some final release fixes (#6933)

* Some final release fixes

* Fix team switching with image in channel bug
---
 webapp/components/admin_console/saml_settings.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'webapp/components/admin_console')

diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx
index 4c0c0c8fd..2358660da 100644
--- a/webapp/components/admin_console/saml_settings.jsx
+++ b/webapp/components/admin_console/saml_settings.jsx
@@ -77,15 +77,15 @@ export default class SamlSettings extends AdminSettings {
         AdminActions.samlCertificateStatus(
             (data) => {
                 const files = {};
-                if (!data.IdpCertificateFile) {
+                if (!data.idp_certificate_file) {
                     files.idpCertificateFile = '';
                 }
 
-                if (!data.PublicCertificateFile) {
+                if (!data.public_certificate_file) {
                     files.publicCertificateFile = '';
                 }
 
-                if (!data.PrivateKeyFile) {
+                if (!data.private_key_file) {
                     files.privateKeyFile = '';
                 }
                 this.setState(files);
-- 
cgit v1.2.3-1-g7c22