From 80679faaa796258cef52047136ec8ca9b75b0146 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 4 Feb 2016 10:25:46 -0800 Subject: Update email_settings.jsx --- web/react/components/admin_console/email_settings.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 435eff036..c51427aba 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', @@ -954,4 +954,4 @@ EmailSettings.propTypes = { config: React.PropTypes.object }; -export default injectIntl(EmailSettings); \ No newline at end of file +export default injectIntl(EmailSettings); -- cgit v1.2.3-1-g7c22 From d1b7c1582f7497a387b6f54463c50907f288572f Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 4 Feb 2016 11:06:18 -0800 Subject: Update en.json --- web/static/i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index a160aa58f..e38c2f89c 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -80,7 +80,7 @@ "admin.email.connectionSecurityStart": "STARTTLS", "admin.email.inviteSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"", "admin.email.passwordSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"", - "admin.email.pushServerEx": "E.g.: \"https://push-test.mattermost.com\"", + "admin.email.pushServerEx": "E.g.: \"http://push-test.mattermost.com\"", "admin.email.testing": "Testing...", "admin.email.saving": "Saving Config...", "admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.", @@ -1257,4 +1257,4 @@ "intro_messages.beginning": "Beginning of {name}", "intro_messages.invite": "Invite others to this {type}", "intro_messages.setHeader": "Set a Header" -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From 87c9413e37e8143de2d2e4ceb5f7b7bcbeba425c Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 4 Feb 2016 11:06:51 -0800 Subject: Update es.json --- web/static/i18n/es.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web') diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 0a780c442..48848d026 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -74,7 +74,7 @@ "admin.email.passwordSaltTitle": "Resetear el Salt para las contraseñas:", "admin.email.pushDesc": "Normalmente se asigna como verdadero en producción. Cuando está en verdadero, Mattermost intenta enviar notificaciones a dispositivos iOS y Android a través del servidor de notificaciones.", "admin.email.pushServerDesc": "Ubicación del servicio de notificaciones push de Mattermost, puedes ubicarlo detras de un cortafuego utilizando https://github.com/mattermost/push-proxy. Para realizar pruebas puedes utilizar https://push-test.mattermost.com, el cual conecta con la ap de ejemplo de Mattermost en iOS publicada en el Apple AppStore. Por favor no utilices este servicio en producción.", - "admin.email.pushServerEx": "Ej.: \"https://push-test.mattermost.com\"", + "admin.email.pushServerEx": "Ej.: \"http://push-test.mattermost.com\"", "admin.email.pushServerTitle": "Servidor de Notificaciones:", "admin.email.pushTitle": "Envío de Notificaciones: ", "admin.email.regenerate": "Regenerar", @@ -1216,4 +1216,4 @@ "view_image_popover.download": "Descargar", "view_image_popover.file": "Archivo {count} de {total}", "view_image_popover.publicLink": "Obtener Enlace Público" -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From fc9494b5876c7290e2ea3d11a79004a27fbb9c1d Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 4 Feb 2016 15:37:17 -0800 Subject: Update email_settings.jsx --- web/react/components/admin_console/email_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index c51427aba..1d8f9c1dc 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -918,7 +918,7 @@ class EmailSettings extends React.Component {

-- cgit v1.2.3-1-g7c22 From ef427dacf3fca18975d65706c34821fbfdbad468 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 4 Feb 2016 15:38:54 -0800 Subject: Update en.json --- web/static/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index e38c2f89c..1a60836d1 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -123,7 +123,7 @@ "admin.email.pushTitle": "Send Push Notifications: ", "admin.email.pushDesc": "Typically set to true in production. When true, Mattermost attempts to send iOS and Android push notifications through the push notification server.", "admin.email.pushServerTitle": "Push Notification Server:", - "admin.email.pushServerDesc": "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.", + "admin.email.pushServerDesc": "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. To troubleshoot, set Log Settings > File Log Level to DEBUG to log sending of push notifications. Please do not use test service for production deployments.", "admin.email.save": "Save", "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"", "admin.gitlab.clientSecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"", -- cgit v1.2.3-1-g7c22 From a69648984cf3fa22007d15ac0c78211fc286a721 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 4 Feb 2016 15:39:34 -0800 Subject: Update es.json --- web/static/i18n/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 48848d026..a918b845f 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -73,7 +73,7 @@ "admin.email.passwordSaltExample": "Ej \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"", "admin.email.passwordSaltTitle": "Resetear el Salt para las contraseñas:", "admin.email.pushDesc": "Normalmente se asigna como verdadero en producción. Cuando está en verdadero, Mattermost intenta enviar notificaciones a dispositivos iOS y Android a través del servidor de notificaciones.", - "admin.email.pushServerDesc": "Ubicación del servicio de notificaciones push de Mattermost, puedes ubicarlo detras de un cortafuego utilizando https://github.com/mattermost/push-proxy. Para realizar pruebas puedes utilizar https://push-test.mattermost.com, el cual conecta con la ap de ejemplo de Mattermost en iOS publicada en el Apple AppStore. Por favor no utilices este servicio en producción.", + "admin.email.pushServerDesc": "Ubicación del servicio de notificaciones push de Mattermost, puedes ubicarlo detras de un cortafuego utilizando https://github.com/mattermost/push-proxy. Para realizar pruebas puedes utilizar http://push-test.mattermost.com, el cual conecta con la ap de ejemplo de Mattermost en iOS publicada en el Apple AppStore. Por favor no utilices este servicio en producción.", "admin.email.pushServerEx": "Ej.: \"http://push-test.mattermost.com\"", "admin.email.pushServerTitle": "Servidor de Notificaciones:", "admin.email.pushTitle": "Envío de Notificaciones: ", -- cgit v1.2.3-1-g7c22 From b25e7e227aec41754b790ab60ce3697ac1da0425 Mon Sep 17 00:00:00 2001 From: it33 Date: Thu, 4 Feb 2016 15:41:03 -0800 Subject: Update en.json --- web/static/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 1a60836d1..888af6cb6 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -279,7 +279,7 @@ "admin.log.fileTitle": "Log To File: ", "admin.log.fileDescription": "Typically set to true in production. When true, log files are written to the log file specified in file location field below.", "admin.log.fileLevelTitle": "File Log Level:", - "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.", + "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues. Also includes push notification and email send events for troubleshooting notifications.", "admin.log.locationTitle": "File Location:", "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.", "admin.log.formatTitle": "File Format:", -- cgit v1.2.3-1-g7c22