PLT-4298 Remove "Return to ongoing call" (#4101)

Этот коммит содержится в:
enahum
2016-09-28 09:48:19 -03:00
коммит произвёл Christopher Speller
родитель 5288255ca3
Коммит 45ca052482
3 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@@ -112,7 +112,7 @@ export default class RateSettings extends AdminSettings {
helpText={ helpText={
<FormattedMessage <FormattedMessage
id='admin.rate.maxBurstDescription' id='admin.rate.maxBurstDescription'
defaultMessage='Maxumum number of requests allowed beyond the per second query limit.' defaultMessage='Maximum number of requests allowed beyond the per second query limit.'
/> />
} }
value={this.state.maxBurst} value={this.state.maxBurst}

Просмотреть файл

@@ -734,7 +734,9 @@ export default class WebrtcController extends React.Component {
this.onSessionError(); this.onSessionError();
return this.doCleanup(); return this.doCleanup();
} }
WebrtcStore.setVideoCallWith(null); WebrtcStore.setVideoCallWith(null);
WebrtcStore.emitRhsChanged(false);
if (manual) { if (manual) {
return this.close(); return this.close();

Просмотреть файл

@@ -545,7 +545,7 @@
"admin.rate.title": "Rate Limit Settings", "admin.rate.title": "Rate Limit Settings",
"admin.rate.maxBurst": "Max Burst:", "admin.rate.maxBurst": "Max Burst:",
"admin.rate.maxBurstExample": "Ex \"100\"", "admin.rate.maxBurstExample": "Ex \"100\"",
"admin.rate.maxBurstDescription": "Maxumum number of requests allowed beyond the per second query limit.", "admin.rate.maxBurstDescription": "Maximum number of requests allowed beyond the per second query limit.",
"admin.recycle.button": "Recycle Database Connections", "admin.recycle.button": "Recycle Database Connections",
"admin.recycle.loading": " Recycling...", "admin.recycle.loading": " Recycling...",
"admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.", "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.",