summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-02-22 08:49:23 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-02-22 08:49:23 -0500
commit51680a7cd84661340cb727fea09b99d5350d9160 (patch)
tree6507090e0a3c4425c59ef5aaa9fc584d4c42466a
parent040bff2b9f384b88179f6ec1beb40d92102c9ba3 (diff)
parent0986057c642a1d69ebfdd8994afd3449601facc3 (diff)
downloadchat-51680a7cd84661340cb727fea09b99d5350d9160.tar.gz
chat-51680a7cd84661340cb727fea09b99d5350d9160.tar.bz2
chat-51680a7cd84661340cb727fea09b99d5350d9160.zip
Merge pull request #2204 from kernicPanel/PLT-1880
PLT-1800 Replace webhooks documentation URL
-rw-r--r--web/react/components/user_settings/manage_incoming_hooks.jsx2
-rw-r--r--web/react/components/user_settings/manage_outgoing_hooks.jsx4
-rw-r--r--web/static/i18n/en.json6
-rw-r--r--web/static/i18n/es.json6
4 files changed, 9 insertions, 9 deletions
diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx
index e79ec6f6c..68e99be7d 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -183,7 +183,7 @@ export default class ManageIncomingHooks extends React.Component {
<div key='addIncomingHook'>
<FormattedHTMLMessage
id='user.settings.hooks_in.description'
- defaultMessage='Create webhook URLs for use in external integrations. Please see <a href="http://mattermost.org/webhooks" target="_blank">http://mattermost.org/webhooks</a> to learn more.'
+ defaultMessage='Create webhook URLs for use in external integrations. Please see <a href="http://docs.mattermost.com/developer/webhooks-incoming.html" target="_blank">incoming webhooks documentation</a> to learn more.'
/>
<div><label className='control-label padding-top x2'>
<FormattedMessage
diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx
index 44aab486e..9c3a60ed5 100644
--- a/web/react/components/user_settings/manage_outgoing_hooks.jsx
+++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx
@@ -284,7 +284,7 @@ class ManageOutgoingHooks extends React.Component {
<div key='addOutgoingHook'>
<FormattedHTMLMessage
id='user.settings.hooks_out.addDescription'
- defaultMessage='Create webhooks to send new message events to an external integration. Please see <a href="http://mattermost.org/webhooks">http://mattermost.org/webhooks</a> to learn more.'
+ defaultMessage='Create webhooks to send new message events to an external integration. Please see <a href="http://docs.mattermost.com/developer/webhooks-outgoing.html" target="_blank">outgoing webhooks documentation</a> to learn more.'
/>
<div><label className='control-label padding-top x2'>
<FormattedMessage
@@ -392,4 +392,4 @@ ManageOutgoingHooks.propTypes = {
intl: intlShape.isRequired
};
-export default injectIntl(ManageOutgoingHooks); \ No newline at end of file
+export default injectIntl(ManageOutgoingHooks);
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 3d83eeda1..1dc0bdebc 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -1111,7 +1111,7 @@
"user.settings.hooks_in.channel": "Channel: ",
"user.settings.hooks_in.none": "None",
"user.settings.hooks_in.existing": "Existing incoming webhooks",
- "user.settings.hooks_in.description": "Create webhook URLs for use in external integrations. Please see <a href=\"http://mattermost.org/webhooks\" target=\"_blank\">http://mattermost.org/webhooks</a> to learn more.",
+ "user.settings.hooks_in.description": "Create webhook URLs for use in external integrations. Please see <a href=\"http://docs.mattermost.com/developer/webhooks-incoming.html\" target=\"_blank\">incoming webhooks documentation</a> to learn more.",
"user.settings.hooks_in.addTitle": "Add a new incoming webhook",
"user.settings.hooks_in.add": "Add",
"user.settings.languages.change": "Change interface language",
@@ -1124,7 +1124,7 @@
"user.settings.hooks_out.regen": "Regen Token",
"user.settings.hooks_out.none": "None",
"user.settings.hooks_out.existing": "Existing outgoing webhooks",
- "user.settings.hooks_out.addDescription": "Create webhooks to send new message events to an external integration. Please see <a href=\"http://mattermost.org/webhooks\">http://mattermost.org/webhooks</a> to learn more.",
+ "user.settings.hooks_out.addDescription": "Create webhooks to send new message events to an external integration. Please see <a href=\"http://docs.mattermost.com/developer/webhooks-outgoing.html\" target=\"_blank\">outgoing webhooks documentation</a> to learn more.",
"user.settings.hooks_out.addTitle": "Add a new outgoing webhook",
"user.settings.hooks_out.only": "Only public channels can be used",
"user.settings.hooks_out.comma": "Comma separated words to trigger on",
@@ -1275,4 +1275,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
+}
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 8a4e96eb6..5723bd171 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -1185,11 +1185,11 @@
"user.settings.hooks_in.add": "Agregar",
"user.settings.hooks_in.addTitle": "Agregar un nuevo webhook de entrada",
"user.settings.hooks_in.channel": "Canal: ",
- "user.settings.hooks_in.description": "Crea webhooks URLs para utilizarlos con integraciones externas. Por favor revisa <a href=\"http://mattermost.org/webhooks\" target=\"_blank\">http://mattermost.org/webhooks</a> para aprender más.",
+ "user.settings.hooks_in.description": "Crea webhooks URLs para utilizarlos con integraciones externas. Por favor revisa <a href=\"http://docs.mattermost.com/developer/webhooks-incoming.html\" target=\"_blank\">documentación de webhook de entrada</a> para aprender más.",
"user.settings.hooks_in.existing": "Webhooks de entrada existentes",
"user.settings.hooks_in.none": "Ninguno",
"user.settings.hooks_out.add": "Agregar",
- "user.settings.hooks_out.addDescription": "Crea webhooks para enviar los nuevos mensajes a una integración externa. Por favor revisa <a href=\"http://mattermost.org/webhooks\">http://mattermost.org/webhooks</a> para conocer más.",
+ "user.settings.hooks_out.addDescription": "Crea webhooks para enviar los nuevos mensajes a una integración externa. Por favor revisa <a href=\"http://docs.mattermost.com/developer/webhooks-outgoing.html\" target=\"_blank\">documentación de webhook de salida</a> para conocer más.",
"user.settings.hooks_out.addTitle": "Agregar un nuevo webhook de salida",
"user.settings.hooks_out.callback": "Callback URLs:",
"user.settings.hooks_out.callbackDesc": "Separa por una nueva linea cada URL donde quieres recibir el evento de HTTP POST",
@@ -1275,4 +1275,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
+}