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.

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

Add ability to provide multiple hardcoded server URLs via CMake define #7160

Merged
merged 11 commits into from
Sep 24, 2024

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Sep 19, 2024

Can be done by feeding a JSON array string describing the multiple servers to the APPLICATION_SERVER_URL define (so when using CMake, for example, -DAPPLICATION_SERVER_URL=[{\"name\": \"server1\", \"url\": \"https://c.a.com\"},{\"name\": \"server2\", \"url\": \"https://c.b.com\"}]'

If the override server URLs are enforced (via APPLICATION_SERVER_URL_ENFORCE) then a combo box will be shown letting the user pick the server in question

Screenshot 2024-09-19 at 18 18 19

@mgallien mgallien force-pushed the feature/hard-coded-servers branch from fe2132a to 2f0987f Compare September 23, 2024 08:49
@claucambra claucambra force-pushed the feature/hard-coded-servers branch 2 times, most recently from a2d977b to efb18ea Compare September 24, 2024 06:39
Copy link

sonarcloud bot commented Sep 24, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 80%)
C Maintainability Rating on New Code (required ≥ A)
19 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

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

Signed-off-by: Claudio Cambra <[email protected]>
…act a JSON array string describing multiple servers

Signed-off-by: Claudio Cambra <[email protected]>
…box selection url as url in setup page

Signed-off-by: Claudio Cambra <[email protected]>
… error string in setup page

Signed-off-by: Claudio Cambra <[email protected]>
…ive but have multiple servers

Signed-off-by: Claudio Cambra <[email protected]>
@mgallien mgallien force-pushed the feature/hard-coded-servers branch from efb18ea to c16b620 Compare September 24, 2024 08:39
@mgallien mgallien merged commit 432369a into master Sep 24, 2024
9 of 14 checks passed
@mgallien mgallien deleted the feature/hard-coded-servers branch September 24, 2024 08:39
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7160-c16b6205f155fff54963501eff2f32b550a8ccad-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.

@tobiasKaminsky
Copy link
Member

/backport to stable-3.14

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants