From ddd4b06b34242f3572313cae45cf4d229601c5f4 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Fri, 26 Feb 2016 11:27:06 -0800
Subject: Update manage_incoming_hooks.jsx

---
 web/react/components/user_settings/manage_incoming_hooks.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx
index 68e99be7d..79a71b5ac 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://docs.mattermost.com/developer/webhooks-incoming.html" target="_blank">incoming webhooks documentation</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. View all incoming webhooks configured on this team below.'
                 />
                 <div><label className='control-label padding-top x2'>
                     <FormattedMessage
-- 
cgit v1.2.3-1-g7c22


From 4420a75cb94ec902ca0fd872c164e37bb1ec923b Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Fri, 26 Feb 2016 11:28:19 -0800
Subject: Update manage_outgoing_hooks.jsx

---
 web/react/components/user_settings/manage_outgoing_hooks.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx
index 9c3a60ed5..487254d15 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://docs.mattermost.com/developer/webhooks-outgoing.html" target="_blank">outgoing webhooks documentation</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. View all outgoing webhooks configured on this team below.'
                 />
                 <div><label className='control-label padding-top x2'>
                     <FormattedMessage
-- 
cgit v1.2.3-1-g7c22


From cfc16fe7150831c7960401da4c18ba7369447527 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Fri, 26 Feb 2016 11:29:09 -0800
Subject: Update manage_command_hooks.jsx

---
 web/react/components/user_settings/manage_command_hooks.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/react/components/user_settings/manage_command_hooks.jsx b/web/react/components/user_settings/manage_command_hooks.jsx
index bd0659a47..2947138be 100644
--- a/web/react/components/user_settings/manage_command_hooks.jsx
+++ b/web/react/components/user_settings/manage_command_hooks.jsx
@@ -420,7 +420,7 @@ export default class ManageCommandCmds extends React.Component {
             <div key='addCommandCmd'>
                 <FormattedHTMLMessage
                     id='user.settings.cmds.add_desc'
-                    defaultMessage='Create slash commands to send events to external integrations and receive a response. For example typing `/patient Joe Smith` could bring back search results from your internal health records management system for the name “Joe Smith”.  Please see <a href="http://docs.mattermost.com/developer/slash-commands.html">Slash commands documentation</a>  for detailed instructions.'
+                    defaultMessage='Create slash commands to send events to external integrations and receive a response. For example typing `/patient Joe Smith` could bring back search results from your internal health records management system for the name “Joe Smith”.  Please see <a href="http://docs.mattermost.com/developer/slash-commands.html">Slash commands documentation</a>  for detailed instructions. View all slash commands configured on this team below.'
                 />
                 <div><label className='control-label padding-top x2'>
                     <FormattedMessage
-- 
cgit v1.2.3-1-g7c22


From f8a90a24531092cd4ebdd2e08a75f04a709626d6 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Fri, 26 Feb 2016 11:32:31 -0800
Subject: Update integrations help text in en.json

---
 web/static/i18n/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 32ceb494f..b4c801f5d 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -1072,7 +1072,7 @@
   "user.settings.advance.sendTitle": "Send messages on Ctrl + Enter",
   "user.settings.advance.title": "Advanced Settings",
   "user.settings.cmds.add": "Add",
-  "user.settings.cmds.add_desc": "Create slash commands to send events to external integrations and receive a response. For example typing `/patient Joe Smith` could bring back search results from your internal health records management system for the name “Joe Smith”.  Please see <a href=\"http://docs.mattermost.com/developer/slash-commands.html\">Slash commands documentation</a>  for detailed instructions.",
+  "user.settings.cmds.add_desc": "Create slash commands to send events to external integrations and receive a response. For example typing `/patient Joe Smith` could bring back search results from your internal health records management system for the name “Joe Smith”.  Please see <a href=\"http://docs.mattermost.com/developer/slash-commands.html\">Slash commands documentation</a>  for detailed instructions. View all slash commands configured on this team below.",
   "user.settings.cmds.add_display_name.placeholder": "Example: \"Search patient records\"",
   "user.settings.cmds.add_new": "Add a new command",
   "user.settings.cmds.add_trigger.placeholder": "Command trigger e.g. \"hello\" not including the slash",
@@ -1185,11 +1185,11 @@
   "user.settings.hooks_in.add": "Add",
   "user.settings.hooks_in.addTitle": "Add a new incoming webhook",
   "user.settings.hooks_in.channel": "Channel: ",
-  "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.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. View all incoming webhooks configured on this team below.",
   "user.settings.hooks_in.existing": "Existing incoming webhooks",
   "user.settings.hooks_in.none": "None",
   "user.settings.hooks_out.add": "Add",
-  "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.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. View all outgoing webhooks configured on this team below.",
   "user.settings.hooks_out.addTitle": "Add a new outgoing webhook",
   "user.settings.hooks_out.callback": "Callback URLs: ",
   "user.settings.hooks_out.callbackDesc": "New line separated URLs that will receive the HTTP POST event",
-- 
cgit v1.2.3-1-g7c22


From 12d215a9495a89ddf8293ac4260039ce2828c3e1 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Fri, 26 Feb 2016 11:36:49 -0800
Subject: Removing updated entries in es.json for integrations help text

---
 web/static/i18n/es.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 30a501a7e..c312c1a12 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -1072,7 +1072,6 @@
   "user.settings.advance.sendTitle": "Enviar mensajes con Ctrl + Retorno",
   "user.settings.advance.title": "Configuración Avanzada",
   "user.settings.cmds.add": "Agregar",
-  "user.settings.cmds.add_desc": "Crea comandos de barra para enviar eventos a integraciones externas y recibir una respuesta. Por ejemplo al escribir `/paciente Joe Smith` podría retornar resultados de una búsqueda en tu sistema de adminitración de salud para el nombre “Joe Smith”.  Por favor revisa la <a href=\"http://docs.mattermost.com/developer/slash-commands.html\">Documentación de comandos de barra</a>  para instrucciones detallas.",
   "user.settings.cmds.add_display_name.placeholder": "Ejemplo: \"Buscar registros del paciente\"",
   "user.settings.cmds.add_new": "Agregar un nuevo comando",
   "user.settings.cmds.add_trigger.placeholder": "Gatillador del Comando ej. \"hola\" no se debe incluir la barra",
@@ -1185,11 +1184,9 @@
   "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://docs.mattermost.com/developer/webhooks-incoming.html\" target=\"_blank\">documentación de webhook de entrada</a> para conocer 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://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",
-- 
cgit v1.2.3-1-g7c22


From b04260407e2069e2d57bd70e1f3c0872faf5a1b2 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Fri, 26 Feb 2016 11:39:43 -0800
Subject: Removing updated entries in pt.json for integrations help text

---
 web/static/i18n/pt.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json
index ed2399799..e95ca3b9f 100644
--- a/web/static/i18n/pt.json
+++ b/web/static/i18n/pt.json
@@ -1071,7 +1071,6 @@
   "user.settings.advance.sendTitle": "Enviar mensagens Ctrl + Enter",
   "user.settings.advance.title": "Configurações Avançadas",
   "user.settings.cmds.add": "Adicionar",
-  "user.settings.cmds.add_desc": "Criar comandos slash para enviar eventos para integrações externas e receber uma resposta. Por exemplo digitando `/patient Joe Smith` poderia trazer de volta os resultados de pesquisa a partir do seu sistema de gestão de registos internos de saúde para o nome “Joe Smith”.  Por favor veja <a href=\"http://docs.mattermost.com/developer/slash-commands.html\">Documentação comandos Slash</a>  para detalhes e instruções.",
   "user.settings.cmds.add_display_name.placeholder": "Exemplo: \"Procurar registros de pacientes\"",
   "user.settings.cmds.add_new": "Adicionar um novo comando",
   "user.settings.cmds.add_trigger.placeholder": "Comando de gatilho ex. \"hello\", não incluí a barra",
@@ -1184,11 +1183,9 @@
   "user.settings.hooks_in.add": "Adicionar",
   "user.settings.hooks_in.addTitle": "Adicionar um novo webhook entrada",
   "user.settings.hooks_in.channel": "Canal: ",
-  "user.settings.hooks_in.description": "Criar URLs webhook para usar em integrações externas. Por favor veja <a href=\"http://docs.mattermost.com/developer/webhooks-incoming.html\" target=\"_blank\">documentação webhook entrada</a> para saber mais.",
   "user.settings.hooks_in.existing": "Webhooks de entrada existentes",
   "user.settings.hooks_in.none": "Nenhum",
   "user.settings.hooks_out.add": "Adicionar",
-  "user.settings.hooks_out.addDescription": "Criar webhooks para enviar novos mensagens de eventos para uma integração externa. Por favor veja <a href=\"http://docs.mattermost.com/developer/webhooks-outgoing.html\" target=\"_blank\">documentação webhook saída</a>  para saber mais.",
   "user.settings.hooks_out.addTitle": "Adicionar um novo webhook saída",
   "user.settings.hooks_out.callback": "Callback URLs: ",
   "user.settings.hooks_out.callbackDesc": "Nova linha separada de URLs que receberá o evento HTTP POST",
@@ -1274,4 +1271,4 @@
   "view_image_popover.download": "Download",
   "view_image_popover.file": "Arquivo {count} de {total}",
   "view_image_popover.publicLink": "Obter O Link Público"
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-1-g7c22