diff --git a/README.md b/README.md index 4411d04..554144f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# ShadowsocksX-NG +# ShadowsocksX-NG-R -Current version is 1.2 +Current version is 1.3.2-R2 -[![Build Status](https://travis-ci.org/qiuyuzhou/ShadowsocksX-NG.svg?branch=develop)](https://travis-ci.org/qiuyuzhou/ShadowsocksX-NG) +[![Build Status](https://travis-ci.org/qinyuhang/ShadowsocksX-NG.svg?branch=develop)](https://travis-ci.org/qiuyuzhou/ShadowsocksX-NG) Next Generation of [ShadowsocksX](https://github.com/shadowsocks/shadowsocks-iOS) @@ -42,6 +42,8 @@ Then I rewrite the GUI code by swift. - Local socks5 timeout. - If enable UDP relay. - GFW List url. + - White List url.(will be added after solve PAC not work on macOS 10.12) + - Auto update PAC list & white list. - Manual spesify network service profiles which would be configure the proxy. - Could reorder shadowsocks profiles by drag & drop in servers preferences panel. @@ -63,6 +65,9 @@ ref: [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/) - [ ] Embed the http proxy server [privoxy](http://www.privoxy.org/). +## Know Issue +[Issue 1.]() Auto PAC & White list is not working on macOS 10.12 Serria because system proxy not allow [file:///](file:///) protocol. + ## License The project is released under the terms of GPLv3. diff --git a/ShadowsocksX-NG/AppDelegate.swift b/ShadowsocksX-NG/AppDelegate.swift index fd6315d..4f6abc1 100644 --- a/ShadowsocksX-NG/AppDelegate.swift +++ b/ShadowsocksX-NG/AppDelegate.swift @@ -341,7 +341,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele } @IBAction func feedback(sender: NSMenuItem) { - NSWorkspace.sharedWorkspace().openURL(NSURL(string: "https://github.com/qiuyuzhou/ShadowsocksX-NG/issues")!) + NSWorkspace.sharedWorkspace().openURL(NSURL(string: "https://github.com/qinyuhang/ShadowsocksX-NG/issues")!) } @IBAction func showAbout(sender: NSMenuItem) { diff --git a/ShadowsocksX-NG/Info.plist b/ShadowsocksX-NG/Info.plist index dd7fde7..c7ff3ba 100644 --- a/ShadowsocksX-NG/Info.plist +++ b/ShadowsocksX-NG/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.2-R + 1.3.2-R2 CFBundleSignature ???? CFBundleURLTypes diff --git a/ShadowsocksX-NG/PreferencesWindowController.swift b/ShadowsocksX-NG/PreferencesWindowController.swift index 829768d..ade9abc 100644 --- a/ShadowsocksX-NG/PreferencesWindowController.swift +++ b/ShadowsocksX-NG/PreferencesWindowController.swift @@ -70,7 +70,6 @@ class PreferencesWindowController: NSWindowController "origin", "verify_simple", "verify_sha1", - "auth_simple", "auth_sha1", "auth_sha1_v2", ]) diff --git a/ShadowsocksX-NG/ss-local b/ShadowsocksX-NG/ss-local index b74a7be..2d2aea4 100755 Binary files a/ShadowsocksX-NG/ss-local and b/ShadowsocksX-NG/ss-local differ