diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-06 17:24:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-06 17:24:08 -0400 |
commit | 6e7b912ec61a6a791e0e8405ff6f6bd7e622a187 (patch) | |
tree | c2fa1d2bae0b344859339d9077af5d822420e7bb /webapp/components/needs_team | |
parent | 02f09b8af90f1df38762b5257291b31597575dbb (diff) | |
download | chat-6e7b912ec61a6a791e0e8405ff6f6bd7e622a187.tar.gz chat-6e7b912ec61a6a791e0e8405ff6f6bd7e622a187.tar.bz2 chat-6e7b912ec61a6a791e0e8405ff6f6bd7e622a187.zip |
PLT-4257 Add pop-up asking if user wants to reset status (#6526)
* Add pop-up asking if user wants to reset status
* Update test snapshot
* Update prop name for old uses of confirm modal
* Updating checkbox (#6586)
* Updating style for checkbox (#6596)
Diffstat (limited to 'webapp/components/needs_team')
-rw-r--r-- | webapp/components/needs_team/needs_team.jsx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/needs_team/needs_team.jsx b/webapp/components/needs_team/needs_team.jsx index 95556fb31..4f5188a47 100644 --- a/webapp/components/needs_team/needs_team.jsx +++ b/webapp/components/needs_team/needs_team.jsx @@ -1,9 +1,8 @@ -import PropTypes from 'prop-types'; - // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. import React from 'react'; +import PropTypes from 'prop-types'; import $ from 'jquery'; @@ -42,6 +41,7 @@ import RemovedFromChannelModal from 'components/removed_from_channel_modal.jsx'; import ImportThemeModal from 'components/user_settings/import_theme_modal.jsx'; import InviteMemberModal from 'components/invite_member_modal.jsx'; import LeaveTeamModal from 'components/leave_team_modal.jsx'; +import ResetStatusModal from 'components/reset_status_modal'; import iNoBounce from 'inobounce'; import * as UserAgent from 'utils/user_agent.jsx'; @@ -229,6 +229,7 @@ export default class NeedsTeam extends React.Component { <EditPostModal/> <DeletePostModal/> <RemovedFromChannelModal/> + <ResetStatusModal/> </div> </div> ); |