summaryrefslogtreecommitdiffstats
path: root/web/react/pages
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-07-01 18:40:20 -0700
committerAsaad Mahmood <Unknowngi@live.com>2015-07-22 20:11:40 +0500
commitb3b01339306a93d227c4f29337750c4730dd25f1 (patch)
tree250c25d059bdabaef8c803b03735d14924c1c16e /web/react/pages
parenteb7c08ab00a6c1a72e367586fb853c08478f3afa (diff)
downloadchat-b3b01339306a93d227c4f29337750c4730dd25f1.tar.gz
chat-b3b01339306a93d227c4f29337750c4730dd25f1.tar.bz2
chat-b3b01339306a93d227c4f29337750c4730dd25f1.zip
Adding back Access History and Active Devices
Diffstat (limited to 'web/react/pages')
-rw-r--r--web/react/pages/channel.jsx12
1 files changed, 12 insertions, 0 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index f70d60e3a..cc78df120 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -32,6 +32,8 @@ var ErrorBar = require('../components/error_bar.jsx')
var ChannelLoader = require('../components/channel_loader.jsx');
var MentionList = require('../components/mention_list.jsx');
var ChannelInfoModal = require('../components/channel_info_modal.jsx');
+var AccessHistoryModal = require('../components/access_history_modal.jsx');
+var ActivityLogModal = require('../components/activity_log_modal.jsx');
var Constants = require('../utils/constants.jsx');
@@ -205,4 +207,14 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
document.getElementById('edit_mention_tab')
);
+ React.render(
+ <AccessHistoryModal />,
+ document.getElementById('access_history_modal')
+ );
+
+ React.render(
+ <ActivityLogModal />,
+ document.getElementById('activity_log_modal')
+ );
+
};