Merge branch 'main-upstream' into feature/passkey

# Conflicts: # web/src/components/settings/PersonalSetting.jsx # web/src/i18n/locales/en.json # web/src/i18n/locales/zh.json
2025-09-30 12:15:20 +08:00
parent 8eace6bb62 b211f593c3
commit e26c794742
38 changed files with 2674 additions and 106 deletions
@@ -110,6 +110,6 @@ func NewProxyHttpClient(proxyURL string) (*http.Client, error) {
 		return client, nil

 	default:
-		return nil, fmt.Errorf("unsupported proxy scheme: %s", parsedURL.Scheme)
+		return nil, fmt.Errorf("unsupported proxy scheme: %s, must be http, https, socks5 or socks5h", parsedURL.Scheme)
 	}
 }