diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-16 16:26:56 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-16 16:26:56 -0400 |
commit | b1f26540ce29cf4ff403cc7b65b20c891ca64118 (patch) | |
tree | fd7a83ebb963dc5f0208dc4dba00aa2f730a364e /web/react/pages/channel.jsx | |
parent | 4e11fa23d750afbefad099638530b754776a3357 (diff) | |
parent | 47e6a33a4505e13ba4edf37ff1f8fbdadb279ee3 (diff) | |
download | chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.tar.gz chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.tar.bz2 chat-b1f26540ce29cf4ff403cc7b65b20c891ca64118.zip |
Merge pull request #693 from mattermost/mm-1419
Implement OAuth2 service provider functionality.
Diffstat (limited to 'web/react/pages/channel.jsx')
-rw-r--r-- | web/react/pages/channel.jsx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx index fa5710d6b..43493de45 100644 --- a/web/react/pages/channel.jsx +++ b/web/react/pages/channel.jsx @@ -33,6 +33,7 @@ var AccessHistoryModal = require('../components/access_history_modal.jsx'); var ActivityLogModal = require('../components/activity_log_modal.jsx'); var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx'); var FileUploadOverlay = require('../components/file_upload_overlay.jsx'); +var RegisterAppModal = require('../components/register_app_modal.jsx'); var Constants = require('../utils/constants.jsx'); var ActionTypes = Constants.ActionTypes; @@ -222,6 +223,11 @@ function setupChannelPage(props) { />, document.getElementById('file_upload_overlay') ); + + React.render( + <RegisterAppModal />, + document.getElementById('register_app_modal') + ); } global.window.setup_channel_page = setupChannelPage; |