Merge release-3.10 into master (#6654)
* PLT-6787 Fixed being able to send a post before files finished uploading (#6617) * Fix quick switcher for channels/users not stored locally (#6610) * Fix button text on confirm mention modal (#6609) * fix post delete permission of channel admin (#6608) * open comment thread for the most recent reply-able message (#6605) * Use mutex flag with yarn to prevent concurrent builds interfering (#6619) * Use mutex flag with yarn to prevent concurrent builds interfering * Remove yarn mutex file with clean * Minor bug fixes (#6615) * PLT-6774 - Fixing color for offline icon * PLT-6784 - Fixing status icon * Fixing icon margin * Updating caret position * PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620) * Fixing JS error (#6623) * Minor bug fixes (#6622) * PLT-6808 - Updating channel switcher on mobile * PLT-6743 - Updating scrollbar styling * Login instead of failing if user exists in OAuth sign-up flow (#6627) * PLT-6802 Disable team switcher (#6626) * Disable team switcher * Fix ESLint errors * PLT-6807 Ensured select teams page can scroll on iOS (#6630) * Do not redirect from account switch pages on 401 (#6631) * Fixing loadtest command and renaming to /test (#6624) * PLT-6820 Update mattermost-redux dependency (#6632) * translations PR 20170612 (#6629) * Bump HTTP client timeout to 30 seconds (#6633) * For team unreads return empty array instead of null (#6636) * PLT-6831 Fix status modal localization IDs (#6637) * Fix status modal localization IDs * Update test snapshot
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c0a0065472
Коммит
528f2dc6c3
@@ -5,7 +5,7 @@ exports[`components/ResetStatusModal should match snapshot 1`] = `
|
||||
cancelButtonText={
|
||||
<FormattedMessage
|
||||
defaultMessage="No, keep it as \\"{status}\\""
|
||||
id="modal.manual_status.cancel"
|
||||
id="modal.manaul_status.cancel"
|
||||
values={
|
||||
Object {
|
||||
"status": "",
|
||||
@@ -16,7 +16,7 @@ exports[`components/ResetStatusModal should match snapshot 1`] = `
|
||||
checkboxText={
|
||||
<FormattedMessage
|
||||
defaultMessage="Do not ask me again"
|
||||
id="modal.manual_status.ask"
|
||||
id="modal.manaul_status.ask"
|
||||
values={Object {}}
|
||||
/>
|
||||
}
|
||||
@@ -24,14 +24,14 @@ exports[`components/ResetStatusModal should match snapshot 1`] = `
|
||||
confirmButtonText={
|
||||
<FormattedMessage
|
||||
defaultMessage="Yes, set my status to \\"Online\\""
|
||||
id="modal.manual_status.button"
|
||||
id="modal.manaul_status.button"
|
||||
values={Object {}}
|
||||
/>
|
||||
}
|
||||
message={
|
||||
<FormattedMessage
|
||||
defaultMessage="Would you like to switch your status to \\"Online\\"?"
|
||||
id="modal.manual_status.message"
|
||||
id="modal.manaul_status.message"
|
||||
values={Object {}}
|
||||
/>
|
||||
}
|
||||
@@ -42,7 +42,7 @@ exports[`components/ResetStatusModal should match snapshot 1`] = `
|
||||
title={
|
||||
<FormattedMessage
|
||||
defaultMessage="Your status is set to \\"{status}\\""
|
||||
id="modal.manual_status.title"
|
||||
id="modal.manaul_status.title"
|
||||
values={
|
||||
Object {
|
||||
"status": "",
|
||||
|
||||
Ссылка в новой задаче
Block a user