summaryrefslogtreecommitdiffstats
path: root/webapp/actions/websocket_actions.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-07-11 14:21:51 -0400
committerGitHub <noreply@github.com>2016-07-11 14:21:51 -0400
commit9481a4f0ef753499c1d02e3be99a7c59c5467ab6 (patch)
tree4c4d459c1d1efed1a7f45de4acbc9b3521a6f93d /webapp/actions/websocket_actions.jsx
parent1283f6936def48398cca346acec1404a09d20e7b (diff)
downloadchat-9481a4f0ef753499c1d02e3be99a7c59c5467ab6.tar.gz
chat-9481a4f0ef753499c1d02e3be99a7c59c5467ab6.tar.bz2
chat-9481a4f0ef753499c1d02e3be99a7c59c5467ab6.zip
Merge release 3.2 into master (#3548)
* Bumping version to: 3.2.0-rc1 * PLT-2863 fixing bad merge that broke this PR (#3523) * PLT-2863 adding remove user from team * PLT-2863 adding the client side UI * Fixing trailing space * Fixing reported issues * Adding documentatino * Switching to final javascript driver * Fixing bad merge * Fixing bad merge * PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled (#3524) * Login error messages fix (#3525) * daily translations 20160708 (#3533) * Fixed permissions when getting a file attachment to use the correct user id (#3535) * PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML (#3534) * PLT-3560 blocking adding to channel once user is removed (#3537) * Always allow system admins to see the Integrations sidebar (#3536) * Plt 3475 - Post control improvements (#3538) * Adding class to post when dropdown is active. * plt-3475 - Post controls improvements * daily translations 20160711 (#3544)
Diffstat (limited to 'webapp/actions/websocket_actions.jsx')
-rw-r--r--webapp/actions/websocket_actions.jsx2
1 files changed, 2 insertions, 0 deletions
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 9d9cf62b7..7be9d84f3 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -14,6 +14,7 @@ import Client from 'utils/web_client.jsx';
import * as Utils from 'utils/utils.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
+import * as UserActions from 'actions/user_actions.jsx';
import {handleNewPost} from 'actions/post_actions.jsx';
import Constants from 'utils/constants.jsx';
@@ -232,6 +233,7 @@ function handleLeaveTeamEvent(msg) {
browserHistory.push('/');
}
} else if (TeamStore.getCurrentId() === msg.team_id) {
+ UserActions.getMoreDmList();
GlobalActions.emitProfilesForDmList();
}
}