From 00c11b248ad1e3cf415f01a3ec824cb003e03b0a Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 24 Oct 2024 22:09:15 +0800 Subject: [PATCH 1/2] Only display server name in multiple override servers dropdown Signed-off-by: Claudio Cambra --- src/gui/wizard/owncloudsetuppage.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp index 708949f759a6d..28bd2c3d849be 100644 --- a/src/gui/wizard/owncloudsetuppage.cpp +++ b/src/gui/wizard/owncloudsetuppage.cpp @@ -63,8 +63,7 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent) const auto serverObject = serverJson.toObject(); const auto serverName = serverObject.value("name").toString(); const auto serverUrl = serverObject.value("url").toString(); - const auto serverDisplayString = QString("%1 (%2)").arg(serverName, serverUrl); - _ui.comboBox->addItem(serverDisplayString, serverUrl); + _ui.comboBox->addItem(serverName, serverUrl); } } else if (theme->forceOverrideServerUrl()) { _ui.comboBox->hide(); From 9194a19fc93a3408883f6b98814e0264269e341a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 23:22:13 +0000 Subject: [PATCH 2/2] Bump cpp-linter/cpp-linter-action from 2.13.2 to 2.13.3 Bumps [cpp-linter/cpp-linter-action](https://github.com/cpp-linter/cpp-linter-action) from 2.13.2 to 2.13.3. - [Release notes](https://github.com/cpp-linter/cpp-linter-action/releases) - [Commits](https://github.com/cpp-linter/cpp-linter-action/compare/v2.13.2...v2.13.3) --- updated-dependencies: - dependency-name: cpp-linter/cpp-linter-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/clang-format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index b0ce68646b715..4fad95fd39c76 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: cpp-linter/cpp-linter-action@v2.13.2 + - uses: cpp-linter/cpp-linter-action@v2.13.3 id: linter env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}