Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Desktop: Add network proxy ignore setting #648

Merged
merged 3 commits into from
Nov 28, 2018
Merged

Conversation

rihardsgravis
Copy link
Contributor

Description

Add system wide network proxy setting bypass setting.

Type of change

  • Bug fix (a non-breaking change which fixes an issue)
  • Enhancement (a non-breaking change which adds functionality)

How Has This Been Tested?

Tested manually on macOS

Checklist:

  • My code follows the style guidelines for this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • For changes to shared: If applicable, I have verified that my changes are implemented correctly in desktop and mobile

src/desktop/main.js Outdated Show resolved Hide resolved
src/shared/locales/en/translation.json Outdated Show resolved Hide resolved
@rajivshah3 rajivshah3 added T - Bug Type - Bug: Something isn't working T - Enhancement New feature or request labels Nov 27, 2018
@rajivshah3
Copy link
Member

Would this PR solve #503?

@rihardsgravis
Copy link
Contributor Author

rihardsgravis commented Nov 28, 2018

Would this PR solve #503?

No. This change allows to ignore system wide proxy settings. That issue requests for manual proxy input.

@rajivshah3
Copy link
Member

No. This change allows to ignore system wide proxy settings. The issue requests for manual proxy input.

Ah, I see. I was under the impression that this would allow it to detect the system's proxy settings. I might be able to try that in a future PR.

Copy link
Member

@rajivshah3 rajivshah3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! 👍

@rihardsgravis
Copy link
Contributor Author

No. This change allows to ignore system wide proxy settings. The issue requests for manual proxy input.

Ah, I see. I was under the impression that this would allow it to detect the system's proxy settings. I might be able to try that in a future PR.

Electron detects system proxy settings by default. A fix for #503 could be manual proxy input at Trinity Advanced settings.

@rihardsgravis rihardsgravis merged commit 03ba769 into develop Nov 28, 2018
@rajivshah3 rajivshah3 deleted the proxy-settings branch November 29, 2018 00:42
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
C - Desktop T - Bug Type - Bug: Something isn't working T - Enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants