Skip to content

Commit

Permalink
Merge pull request #14153 from nextcloud/revert/14065/setupcheck
Browse files Browse the repository at this point in the history
chore(release): Release 20.1.3
  • Loading branch information
nickvergessen authored Jan 17, 2025
2 parents f171e29 + 5643090 commit 9c09675
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 22 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Changelog
All notable changes to this project will be documented in this file.

## 20.1.2 – 2025-01-16
## 20.1.3 – 2025-01-17
### Changed
- Update translations
- Update dependencies
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.
]]></description>

<version>20.1.2</version>
<version>20.1.3</version>
<licence>agpl</licence>

<author>Anna Larch</author>
Expand Down
9 changes: 1 addition & 8 deletions lib/SetupCheck/HighPerformanceBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,7 @@ public function getName(): string {

public function run(): SetupResult {
if ($this->talkConfig->getSignalingMode() === Config::SIGNALING_INTERNAL) {
$setupResult = SetupResult::error(...);
if ($this->talkConfig->getHideSignalingWarning()) {
$setupResult = SetupResult::warning(...);
}
return $setupResult(
$this->l->t('No High-performance backend configured - Running Nextcloud Talk without the High-performance backend only scales for very small calls (max. 2-3 participants). Please set up the High-performance backend to ensure calls with multiple participants work seamlessly.'),
'https://portal.nextcloud.com/article/Nextcloud-Talk/High-Performance-Backend/Installation-of-Nextcloud-Talk-High-Performance-Backend',
);
return SetupResult::success();
}

if ($this->talkConfig->getSignalingMode() === Config::SIGNALING_CLUSTER_CONVERSATION) {
Expand Down
2 changes: 1 addition & 1 deletion lib/SetupCheck/RecordingBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function run(): SetupResult {
return SetupResult::success();
}
if (empty($this->talkConfig->getRecordingServers())) {
return SetupResult::info($this->l->t('No recording backend configured'));
return SetupResult::success();
}
return SetupResult::error($this->l->t('Using the recording backend requires a High-performance backend.'));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/SetupCheck/SIPConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function run(): SetupResult {
return SetupResult::success();
}
if ($this->talkConfig->getSIPSharedSecret() === '' && $this->talkConfig->getDialInInfo() === '') {
return SetupResult::info($this->l->t('No SIP backend configured'));
return SetupResult::success();
}
return SetupResult::error($this->l->t('Using the SIP functionality requires a High-performance backend.'));
}
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "20.1.2",
"version": "20.1.3",
"private": true,
"description": "",
"author": "Joas Schilling <[email protected]>",
Expand Down
5 changes: 0 additions & 5 deletions src/components/AdminSettings/SignalingServers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

<template>
<section id="signaling_server" class="signaling-servers section">
<NcNoteCard v-if="!servers.length"
type="error"
:heading="t('spreed', 'Nextcloud Talk setup not complete')"
:text="t('spreed', 'Install the High-performance backend to ensure calls with multiple participants work seamlessly.')" />

<h2>
{{ t('spreed', 'High-performance backend') }}
</h2>
Expand Down
4 changes: 2 additions & 2 deletions src/views/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

<template>
<div>
<SignalingServers />
<HostedSignalingServer />
<GeneralSettings />
<AllowedGroups />
<Federation v-if="supportFederation" />
<BotsSettings />
<WebServerSetupChecks />
<StunServers />
<TurnServers />
<SignalingServers />
<HostedSignalingServer />
<RecordingServers />
<SIPBridge />
<MatterbridgeIntegration />
Expand Down

0 comments on commit 9c09675

Please sign in to comment.