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)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
1283f6936d
Коммит
9481a4f0ef
@@ -205,6 +205,19 @@ export function emitPostFocusRightHandSideFromSearch(post, isMentionSearch) {
|
||||
);
|
||||
}
|
||||
|
||||
export function emitLeaveTeam() {
|
||||
Client.removeUserFromTeam(
|
||||
TeamStore.getCurrentId(),
|
||||
UserStore.getCurrentId(),
|
||||
() => {
|
||||
// DO nothing. The websocket should cause a re-direct
|
||||
},
|
||||
(err) => {
|
||||
AsyncClient.dispatchError(err, 'removeUserFromTeam');
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
export function emitLoadMorePostsEvent() {
|
||||
const id = ChannelStore.getCurrentId();
|
||||
loadMorePostsTop(id, false);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user