diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-12 10:55:43 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-12 10:55:43 -0700 |
| commit | 3c42ae312d037ce7e26a8df86355fcba12210a86 (patch) | |
| tree | bc3d0144cdd72354a2bfd0b182a6acc650ce729f /web/react/components | |
| parent | 61f92517f317f4b3f437b8db48f31c569ceb5f2d (diff) | |
| parent | 1da8ae36fa70755402c63ba8de4fba168dc9575e (diff) | |
| download | chat-3c42ae312d037ce7e26a8df86355fcba12210a86.tar.gz chat-3c42ae312d037ce7e26a8df86355fcba12210a86.tar.bz2 chat-3c42ae312d037ce7e26a8df86355fcba12210a86.zip | |
Merge branch 'release-1.1.0' into PLT-586
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/user_settings/manage_incoming_hooks.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/user_settings/user_settings_integrations.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx index 90b4039c7..8817e0d39 100644 --- a/web/react/components/user_settings/manage_incoming_hooks.jsx +++ b/web/react/components/user_settings/manage_incoming_hooks.jsx @@ -148,7 +148,7 @@ export default class ManageIncomingHooks extends React.Component { return ( <div key='addIncomingHook'> - {'Create webhook URLs for channels and private groups. These URLs can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'} + {'For developers building integrations this page lets you create webhook URLs for channels and private groups. Please see http://mattermost.org/webhooks to learn about creating webhooks, view samples, and to let the community know about integrations you have built. The URLs created below can be used by outside applications to create posts in any channels or private groups you have access to. The specified channel will be used as the default.'} <br/> <label className='control-label'>{'Add a new incoming webhook'}</label> <div className='padding-top'> diff --git a/web/react/components/user_settings/user_settings_integrations.jsx b/web/react/components/user_settings/user_settings_integrations.jsx index ea3f72f27..5e20d41f1 100644 --- a/web/react/components/user_settings/user_settings_integrations.jsx +++ b/web/react/components/user_settings/user_settings_integrations.jsx @@ -49,7 +49,7 @@ export default class UserSettingsIntegrationsTab extends React.Component { incomingHooksSection = ( <SettingItemMin title='Incoming Webhooks' - describe='Manage your incoming webhooks' + describe='Manage your incoming webhooks (Developer feature)' updateSection={function updateNameSection() { this.updateSection('incoming-hooks'); }.bind(this)} |