Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable-3.14] Add ability to provide multiple hardcoded server URLs via CMake define #7197

Merged
merged 11 commits into from
Sep 25, 2024
Merged

[stable-3.14] Add ability to provide multiple hardcoded server URLs via CMake define #7197

merged 11 commits into from
Sep 25, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Sep 24, 2024

Backport of PR #7160

@claucambra @backportbot
Add combo box to setup page UI
f1d3d5e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Add property for detecting of application override server url is in f…
a3fe1a7 
…act a JSON array string describing multiple servers

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Do not apply override server url as account url if this is a multi-se…
eb843d7 
…rver JSON string

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Show or hide multi-server overrides or text field depending on type o…
237b58d 
…f override url

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Accept combo box selection as completed state in setup page
54f595b 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
If using multi-server override url and forcing it then provide combo …
91552ea 
…box selection url as url in setup page

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Use url method instead of text field contents as url when deciding on…
3ec48b4 
… error string in setup page

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Do not automatically validate server URL when enforced servers is act…
f6c1f1e 
…ive but have multiple servers

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Display server URL in multi-server enforced combo box
1838390 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Use a raw string in config.h.in for application server url
aa986ea 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @backportbot
Ensure we hide the combo box for multiple override servers by default
f4085e2 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@backportbot backportbot bot added this to the 3.14.1 milestone Sep 24, 2024
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7197-f4085e2ae3be97c506c4741d2fb89ef72c8634f0-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)
1 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@tobiasKaminsky tobiasKaminsky merged commit c5bf4a4 into stable-3.14 Sep 25, 2024
11 of 15 checks passed
@tobiasKaminsky tobiasKaminsky deleted the backport/7160/stable-3.14 branch September 25, 2024 05:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgallien mgallien Awaiting requested review from mgallien

@claucambra claucambra Awaiting requested review from claucambra

Assignees

@claucambra claucambra

Labels
3. to review
Projects
None yet
Milestone
3.14.1
Development

Successfully merging this pull request may close these issues.
3 participants
@nextcloud-desktop-bot @tobiasKaminsky @claucambra