[PR #1159] [MERGED] fix #838 Add global proxy setting #3387

New issue

Closed

opened 2026-02-27 00:56:34 +03:00 by kerem · 0 comments

kerem commented

2026-02-27 00:56:34 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/electerm/electerm/pull/1159
Author: @zxdong262
Created: 2/28/2019
Status: ✅ Merged
Merged: 2/28/2019
Merged by: @zxdong262

Base: master ← Head: fix-838

📝 Commits (1)

984529f fix #838 Add global proxy setting

📊 Changes

6 files changed (+99 additions, -4 deletions)

View changed files

📝 app/config.default.js (+6 -2)
📝 package.json (+2 -2)
➕ src/client/common/merge-proxy.js (+25 -0)
📝 src/client/components/setting-panel/setting.jsx (+62 -0)
📝 src/client/components/sftp/index.jsx (+2 -0)
📝 src/client/components/terminal/index.jsx (+2 -0)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/electerm/electerm/pull/1159 **Author:** [@zxdong262](https://github.com/zxdong262) **Created:** 2/28/2019 **Status:** ✅ Merged **Merged:** 2/28/2019 **Merged by:** [@zxdong262](https://github.com/zxdong262) **Base:** `master` ← **Head:** `fix-838` --- ### 📝 Commits (1) - [`984529f`](https://github.com/electerm/electerm/commit/984529f10dd16da7b70100ee26a85202d2b77991) fix #838 Add global proxy setting ### 📊 Changes **6 files changed** (+99 additions, -4 deletions) <details> <summary>View changed files</summary> 📝 `app/config.default.js` (+6 -2) 📝 `package.json` (+2 -2) ➕ `src/client/common/merge-proxy.js` (+25 -0) 📝 `src/client/components/setting-panel/setting.jsx` (+62 -0) 📝 `src/client/components/sftp/index.jsx` (+2 -0) 📝 `src/client/components/terminal/index.jsx` (+2 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>