diff options
author | Corey Hulen <corey@hulen.com> | 2016-02-04 16:51:53 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-02-04 16:51:53 -0800 |
commit | ccfdfdfce2f9b697baf28041193b39bceb3bd5dc (patch) | |
tree | 542f928bafd2d791eaca115c264601b4079a5a04 /web/react/components/admin_console/email_settings.jsx | |
parent | bab2be98f78792702fd60c16b174dc6ef0b7adf6 (diff) | |
parent | b25e7e227aec41754b790ab60ce3697ac1da0425 (diff) | |
download | chat-ccfdfdfce2f9b697baf28041193b39bceb3bd5dc.tar.gz chat-ccfdfdfce2f9b697baf28041193b39bceb3bd5dc.tar.bz2 chat-ccfdfdfce2f9b697baf28041193b39bceb3bd5dc.zip |
Merge pull request #2079 from mattermost/help-text-updates
Changing URL for testing push notifications
Diffstat (limited to 'web/react/components/admin_console/email_settings.jsx')
-rw-r--r-- | web/react/components/admin_console/email_settings.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 435eff036..1d8f9c1dc 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -54,7 +54,7 @@ var holders = defineMessages({ }, pushServerEx: { id: 'admin.email.pushServerEx', - defaultMessage: 'E.g.: "https://push-test.mattermost.com"' + defaultMessage: 'E.g.: "http://push-test.mattermost.com"' }, testing: { id: 'admin.email.testing', @@ -918,7 +918,7 @@ class EmailSettings extends React.Component { <p className='help-text'> <FormattedMessage id='admin.email.pushServerDesc' - defaultMessage='Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use https://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.' + defaultMessage='Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.' /> </p> </div> @@ -954,4 +954,4 @@ EmailSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(EmailSettings);
\ No newline at end of file +export default injectIntl(EmailSettings); |