diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-07-28 09:54:17 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-28 09:54:17 -0400 |
| commit | 94b905aff5470dbe18037f7ee5e883b51bf228fd (patch) | |
| tree | 7b403e77f36d601ebe591f52f7de22d935059cf2 /web/react/components/activity_log_modal.jsx | |
| parent | 3a297135372c288b11c75acf6100d97c35c9dae3 (diff) | |
| parent | 539a05a6bdcf9b6bcf3df8f04ccdfed5dd4d4ce6 (diff) | |
| download | chat-94b905aff5470dbe18037f7ee5e883b51bf228fd.tar.gz chat-94b905aff5470dbe18037f7ee5e883b51bf228fd.tar.bz2 chat-94b905aff5470dbe18037f7ee5e883b51bf228fd.zip | |
Merge pull request #260 from rgarmsen2295/mm-1724
MM-1724 Changed title of Active Devices to Active Sessions and added help text explaining Active Sessions
Diffstat (limited to 'web/react/components/activity_log_modal.jsx')
| -rw-r--r-- | web/react/components/activity_log_modal.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index 7cce807a9..90f139e8b 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -102,8 +102,9 @@ module.exports = React.createClass({ <div className="modal-content"> <div className="modal-header"> <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 className="modal-title" id="myModalLabel">Active Devices</h4> + <h4 className="modal-title" id="myModalLabel">Active Sessions</h4> </div> + <p className="session-help-text">Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the "Logout" button below to end a session.</p> <div ref="modalBody" className="modal-body"> <form role="form"> { activityList } |