41 Commits
Author SHA1 Message Date
Charlie Qiu 91124b9e90 Merge branch 'pr/85' into develop
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift
2016-10-14 23:39:11 +08:00
王晨 4c295965f2 增加 HTTP代理 跟随全局设置 2016-10-10 14:17:47 +08:00
王晨 3f7e433dd2 更新两处http开关,随ss开启和关闭 2016-10-10 14:17:30 +08:00
王晨 2ab6f95631 add privoxy 2016-10-10 14:17:02 +08:00
bestv 20d76a0850 代理菜单内增加状态栏文本显示开关 2016-10-02 23:59:01 +08:00
Charlie Qiu bfc39d8179 顶级菜单中服务器名前加上文字:服务器. 2016-10-02 01:45:59 +08:00
Charlie Qiu cb9d2b62ad Convert to swift 3 syntax. 2016-10-02 01:39:21 +08:00
Charlie Qiu 294073011b Merge branch 'pr/75' into develop 2016-10-02 01:36:32 +08:00
Charlie Qiu cd5c724bb7 Merge branch 'pr/54' into develop
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift

Update to swift 3 syntax
2016-10-02 01:34:48 +08:00
Charlie Qiu 7a7249b80f Update for swift 3.
- Convert code to swift 3
- Update alamofire to 4.0.1 for swift 3.
2016-10-02 01:17:07 +08:00
Charlie Qiu 7076523cbd Merge branch 'pr/44' into develop 2016-10-02 00:08:33 +08:00
bestv 9c24595486 show running mode on status bar 2016-10-01 12:45:42 +08:00
qinyuhang ff0ab584e9 bug fixs 2016-09-08 21:11:22 +08:00
qinyuhang 9aaf6940e2 菜单现在显示实际使用中的服务器名
菜单现在显示实际使用中的服务器名
2016-09-08 18:47:01 +08:00
qinyuhang cd1b1cd87f add adv settings for pac server
add adv settings for pac server address & port
handle accident crash on stop pac server
2016-08-25 09:19:47 +08:00
qinyuhang 7520fd54a6 解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题
解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题
https://github.com/qiuyuzhou/ShadowsocksX-NG/issues/30
PS 手头没有 macOS 10.12 的机器,麻烦有的请帮忙测试一下
或者可以从 https://github.com/qinyuhang/ShadowsocksX-NG/tree/webserver 下载去
Xcode build 一下
2016-08-23 17:08:21 +08:00
Yicheng 671816b592 auto active service when create first server profile 2016-08-22 23:26:04 +08:00
bjzhou1990 995d43a41e add edit user rule window 2016-08-01 15:28:59 +08:00
WANG Zhenhua de8aa45b02 Move PAC & QRCode menu items to level 2 menu
1. Move PAC related items to *Proxy* submenu.
2. Move QR related items to *Server* submenu.
3. Remove some separators of main menu.
2016-07-10 17:52:33 +08:00
Charlie Qiu 65af97edae Show current proxy mode on top menu item. 2016-07-07 15:51:27 +08:00
Charlie Qiu ea4e006133 Advance preference for proxy.
Manual spesify network services which would be configure.
2016-06-30 02:33:37 +08:00
C.S 94e065ea63 Bugfix use a singleton ServerProfileManager 2016-06-23 10:07:26 +08:00
Charlie Qiu 23696420a5 Add show logs menu item. 2016-06-18 11:06:49 +08:00
Charlie Qiu 7e184d5a1b Add "Enable verbose mode" to adv preferences panel. 2016-06-18 10:44:09 +08:00
Charlie Qiu ce2d4e8a55 Change Default listen address from localhost to 127.0.0.1 2016-06-14 20:26:12 +08:00
Charlie Qiu a4bee86080 Add about menu item. 2016-06-12 08:25:52 +08:00
Charlie Qiu 4991c2cdc4 Add new menu item: "Apply User Rules For PAC" 2016-06-12 08:03:27 +08:00
Charlie Qiu 0b3d3a1320 Better english 2016-06-12 01:19:06 +08:00
Charlie Qiu 5077e880a8 Add feedback menuitem 2016-06-11 18:02:57 +08:00
Charlie Qiu 7590cf2b71 Add menu item "Manual Mode" 2016-06-11 17:47:18 +08:00
Charlie Qiu 69ef77f277 Add menu item "Edit User Rules For PAC..." 2016-06-11 06:21:19 +08:00
Charlie Qiu 98689a83aa Embed libcrypto.1.0.0.dylib which been depand by ss-local. 2016-06-11 00:44:52 +08:00
Charlie Qiu 1e0a1e8618 Handle ss url. 2016-06-10 22:30:48 +08:00
Charlie Qiu 8d98e05a4d Update status bar icon when toggle running. 2016-06-10 21:25:17 +08:00
Charlie Qiu bc12db75c9 Launch at login. 2016-06-10 21:23:10 +08:00
Charlie Qiu ccd666bc2a Look like working now. 2016-06-10 03:59:27 +08:00
Charlie Qiu 250dfc7b38 Show qrcode for current server. 2016-06-09 06:59:42 +08:00
Charlie Qiu 33a093950e Rename is_valid to isValid 2016-06-09 05:44:18 +08:00
Charlie Qiu 2491224f7d 完成PAC生成和从GFWList更新 2016-06-09 03:05:38 +08:00
Charlie Qiu 76be94bb2c 大量代码。 2016-06-09 00:30:08 +08:00
Charlie Qiu ae8848d4e8 Initial Commit 2016-06-05 21:29:13 +08:00