mirror of
https://github.com/zero-peak/ZeroOmega.git
synced 2025-01-22 15:08:12 -05:00
Compare commits
3 Commits
07c950c3f9
...
f405fb3b11
Author | SHA1 | Date | |
---|---|---|---|
|
f405fb3b11 | ||
|
8a2684f2af | ||
|
785cb04196 |
@ -1278,7 +1278,8 @@ msgstr "Other questions? Need help with using ZeroOmega? Please see our "
|
||||
"<a href='https://github.com/FelisCatus/SwitchyOmega/wiki/FAQ'>FAQ</a>."
|
||||
|
||||
msgid "about_copyright"
|
||||
msgstr "Copyright 2024-2025 <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>The ZeroOmega Authors</a>. All rights reserved."
|
||||
msgstr "Copyright 2012-2017 <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>The SwitchyOmega Authors</a>. All rights reserved.<br>"
|
||||
"Copyright 2024-2025 <a href='https://github.com/zero-peak/ZeroOmega/graphs/contributors'>The ZeroOmega Authors</a>."
|
||||
|
||||
msgid "about_credits"
|
||||
msgstr "ZeroOmega is made possible by the <a href='https://github.com/FelisCatus/SwitchyOmega'>ZeroOmega</a> open source project and other <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>open source software</a>."
|
||||
|
@ -1279,8 +1279,8 @@ msgstr "Other questions? Need help with using ZeroOmega? Please see our "
|
||||
"<a href='https://github.com/FelisCatus/SwitchyOmega/wiki/FAQ'>FAQ</a>."
|
||||
|
||||
msgid "about_copyright"
|
||||
msgstr "Copyright 2024-2025 <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>The ZeroOmega Authors</a>. All rights reserved.<br>"
|
||||
"Copyright 2024 <a href='https://github.com/zero-peak/ZeroOmega/graphs/contributors'>The ZeroOmega Authors</a>."
|
||||
msgstr "Copyright 2012-2017 <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>The SwitchyOmega Authors</a>. All rights reserved.<br>"
|
||||
"Copyright 2024-2025 <a href='https://github.com/zero-peak/ZeroOmega/graphs/contributors'>The ZeroOmega Authors</a>."
|
||||
|
||||
msgid "about_credits"
|
||||
msgstr "ZeroOmega is made possible by the <a href='https://github.com/zero-peak/ZeroOmega'>ZeroOmega</a> open source project and other <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>open source software</a>."
|
||||
|
@ -1291,9 +1291,9 @@ msgstr ""
|
||||
|
||||
msgid "about_copyright"
|
||||
msgstr ""
|
||||
"کپی رایت 2025-2024 <a "
|
||||
"کپی رایت 2017-2012 <a "
|
||||
"href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>"
|
||||
"نویسندگان The ZeroOmega </a>. کلیه حقوق محفوظ است، ترجمه شده به فارسی "
|
||||
"نویسندگان The SwitchyOmega </a>. کلیه حقوق محفوظ است، ترجمه شده به فارسی "
|
||||
"توسط گودرز جعفری."
|
||||
|
||||
msgid "about_credits"
|
||||
|
@ -1153,8 +1153,8 @@ msgstr ""
|
||||
"SwitchyOmega/wiki/FAQ'>常见问题</a>。"
|
||||
|
||||
msgid "about_copyright"
|
||||
msgstr "版权所有 2024-2025 <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>The ZeroOmega Authors</a>. 保留所有权利。<br>"
|
||||
"版权所有 2025 <a href='https://github.com/zero-peak/ZeroOmega/graphs/contributors'>The ZeroOmega Authors</a>."
|
||||
msgstr "版权所有 2012-2017 <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>The SwitchyOmega Authors</a>. 保留所有权利。<br>"
|
||||
"版权所有 2024-2025 <a href='https://github.com/zero-peak/ZeroOmega/graphs/contributors'>The ZeroOmega Authors</a>."
|
||||
|
||||
msgid "about_credits"
|
||||
msgstr "ZeroOmega 的诞生离不开 <a href='https://github.com/zero-peak/ZeroOmega'>ZeroOmega</a> 开源项目和其他<a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>开源软件</a>。"
|
||||
|
@ -1143,7 +1143,8 @@ msgstr ""
|
||||
"%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98'>常見問題</a>。"
|
||||
|
||||
msgid "about_copyright"
|
||||
msgstr "版權所有 2024-2025 <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>The ZeroOmega Authors</a>. 保留所有權利。"
|
||||
msgstr "版權所有 2012-2017 <a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>The SwitchyOmega Authors</a>. 保留所有權利。<br>"
|
||||
"版權所有 2024-2025 <a href='https://github.com/zero-peak/ZeroOmega/graphs/contributors'>The ZeroOmega Authors</a>."
|
||||
|
||||
msgid "about_credits"
|
||||
msgstr "ZeroOmega 的誕生離不開 <a href='https://github.com/FelisCatus/SwitchyOmega'>SwitchyOmega</a> 開源項目和其他<a href='https://github.com/FelisCatus/SwitchyOmega/blob/master/AUTHORS'>開源軟體</a>。"
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"manifest_version": 3,
|
||||
"name": "Proxy SwitchyOmega 3 (ZeroOmega)",
|
||||
"version": "3.3.19",
|
||||
"version": "3.3.20",
|
||||
"description": "__MSG_manifest_app_description__",
|
||||
"icons": {
|
||||
"16": "img/icons/omega-action-16.png",
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"manifest_version": 3,
|
||||
"name": "Proxy SwitchyOmega 3 (ZeroOmega)",
|
||||
"version": "3.3.19",
|
||||
"version": "3.3.20",
|
||||
"description": "__MSG_manifest_app_description__",
|
||||
"icons": {
|
||||
"16": "img/icons/omega-action-16.png",
|
||||
|
@ -48,6 +48,7 @@ class FirefoxProxyImpl extends ProxyImpl
|
||||
blobUrl = URL.createObjectURL(blob)
|
||||
browser.proxy.settings.set({
|
||||
value: {
|
||||
proxyDNS: true,
|
||||
proxyType: 'autoConfig',
|
||||
autoConfigUrl: blobUrl
|
||||
}
|
||||
@ -58,7 +59,7 @@ class FirefoxProxyImpl extends ProxyImpl
|
||||
@_optionsReadyCallback = null
|
||||
return @setProxyAuth(profile, options)
|
||||
onRequest: (requestDetails) ->
|
||||
return undefined if browser.extension.isAllowedIncognitoAccess()
|
||||
#return undefined if browser.extension.isAllowedIncognitoAccess()
|
||||
# TODO 将来可以在这里实现按标签进行代理控制功能
|
||||
#return undefined
|
||||
# The browser only recognizes native promises return values, not Bluebird.
|
||||
@ -71,7 +72,7 @@ class FirefoxProxyImpl extends ProxyImpl
|
||||
switch profile.profileType
|
||||
when 'DirectProfile'
|
||||
return {type: 'direct'}
|
||||
when 'SystemProfile'
|
||||
when 'SystemProfile', 'PacProfile'
|
||||
# Returning undefined means using the default proxy from previous.
|
||||
# https://hg.mozilla.org/mozilla-central/rev/9f0ee2f582a2#l1.337
|
||||
return undefined
|
||||
|
@ -38,7 +38,7 @@ angular.module('omega').controller 'FixedProfileCtrl', ($scope, $modal,
|
||||
|
||||
$scope.proxyEditors = {}
|
||||
|
||||
socks5AuthSupported = (browser?.proxy?.register?)
|
||||
socks5AuthSupported = (browser?.proxy?.onRequest?)
|
||||
$scope.authSupported = {
|
||||
"http": true,
|
||||
"https": true,
|
||||
@ -71,8 +71,6 @@ angular.module('omega').controller 'FixedProfileCtrl', ($scope, $modal,
|
||||
return unless proxyEditors
|
||||
for scheme in $scope.urlSchemes
|
||||
proxy = proxyEditors[scheme]
|
||||
if $scope.profile.auth and not $scope.authSupported[proxy.scheme]
|
||||
delete $scope.profile.auth[proxyProperties[scheme]]
|
||||
if not proxy.scheme
|
||||
if not scheme
|
||||
proxyEditors[scheme] = {}
|
||||
|
Loading…
Reference in New Issue
Block a user