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

Cmake option to disable proxy #4218

Merged
merged 1 commit into from
Feb 2, 2022
Merged

Cmake option to disable proxy #4218

merged 1 commit into from
Feb 2, 2022

Conversation

allexzander
Copy link
Contributor

Signed-off-by: alex-z blackslayer4@gmail.com

This will fix #4138

@allexzander
Copy link
Contributor Author

allexzander commented Jan 28, 2022 •
edited
Loading

@tobiasKaminsky This will require a corresponding checkbox on the Web UI that will set DO_NOT_USE_PROXY in the NEXTCLOUD.cmake to ON when needed.

@tobiasKaminsky
Copy link
Member

👍
As I have no real clue about C++/QT: is the proxy setting then also hidden in settings menu?

@allexzander
Copy link
Contributor Author

👍 As I have no real clue about C++/QT: is the proxy setting then also hidden in settings menu?

@tobiasKaminsky Yes, hidden. Also, the config file is overridden and a "No Poxy" setting is written to it.

mgallien
mgallien reviewed Feb 1, 2022
View reviewed changes
src/gui/application.cpp Outdated Show resolved Hide resolved
@allexzander allexzander force-pushed the feature/cmake-option-to-disable-proxy branch from 2e87547 to bff00c7 Compare February 2, 2022 08:45
@allexzander allexzander requested a review from mgallien February 2, 2022 08:46
@mgallien
Copy link
Collaborator

mgallien commented Feb 2, 2022

/rebase

@allexzander @mgallien
Cmake option to disable proxy
0ea7e8d 
Signed-off-by: alex-z <blackslayer4@gmail.com>
@nextcloud-command nextcloud-command force-pushed the feature/cmake-option-to-disable-proxy branch from bff00c7 to 0ea7e8d Compare February 2, 2022 10:02
@sonarcloud
Copy link

sonarcloud bot commented Feb 2, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-4218-0ea7e8d3a6fd7df7ba883bda1e38c1486b0c4bb2-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.

@mgallien mgallien merged commit 375c7b5 into master Feb 2, 2022
@mgallien mgallien deleted the feature/cmake-option-to-disable-proxy branch February 2, 2022 10:45
@allexzander
Copy link
Contributor Author

/backport to stable-3.4

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Feb 3, 2022
Merged
@mgallien mgallien added this to the 3.5.0 milestone Feb 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@claucambra claucambra claucambra approved these changes

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.5.0
Development

Successfully merging this pull request may close these issues.

Cmake option to disable proxy
5 participants
@allexzander @tobiasKaminsky @mgallien @nextcloud-desktop-bot @claucambra