diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-06-29 08:14:02 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-06-29 08:14:02 -0400 |
commit | 0792eb18d535410b456f3cc569e243efb85a47b6 (patch) | |
tree | 4ea6caf1e890703b4bb4e727ebce0099dfc88327 /web/react/components/sidebar_right_menu.jsx | |
parent | afb62bb40a012a7e00707f384020e1431abca1ed (diff) | |
parent | 366557b101f318b69ad854349c2414783ce1c82a (diff) | |
download | chat-0792eb18d535410b456f3cc569e243efb85a47b6.tar.gz chat-0792eb18d535410b456f3cc569e243efb85a47b6.tar.bz2 chat-0792eb18d535410b456f3cc569e243efb85a47b6.zip |
Merge pull request #49 from mattermost/mm-1316
fixes mm-1316 improves channel notifications UI and updates channellist etag
Diffstat (limited to 'web/react/components/sidebar_right_menu.jsx')
-rw-r--r-- | web/react/components/sidebar_right_menu.jsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx index c523ce554..22d1d9ad2 100644 --- a/web/react/components/sidebar_right_menu.jsx +++ b/web/react/components/sidebar_right_menu.jsx @@ -60,6 +60,7 @@ module.exports = React.createClass({ <div className="nav-pills__container"> <ul className="nav nav-pills nav-stacked"> <li><a href="#" data-toggle="modal" data-target="#user_settings1"><i className="glyphicon glyphicon-cog"></i>Account Settings</a></li> + { isAdmin ? <li><a href="#" data-toggle="modal" data-target="#team_settings"><i className="glyphicon glyphicon-globe"></i>Team Settings</a></li> : "" } { invite_link } { team_link } { manage_link } |