Commit Graph

365 Commits

Author SHA1 Message Date
20d76a0850 代理菜单内增加状态栏文本显示开关 2016-10-02 23:59:01 +08:00
cc467c4df2 Update travis to use image xocde8 instead of xocde7.3 2016-10-02 15:14:09 +08:00
dff5679dcb Update requirements in readme. 2016-10-02 02:11:09 +08:00
bfc39d8179 顶级菜单中服务器名前加上文字:服务器. 2016-10-02 01:45:59 +08:00
cb9d2b62ad Convert to swift 3 syntax. 2016-10-02 01:39:21 +08:00
294073011b Merge branch 'pr/75' into develop 2016-10-02 01:36:32 +08:00
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
07532daac2 Merge pull request #73 from whao/patch-1
Typo fix
2016-10-02 01:26:55 +08:00
b389dc226c Call webServer startWithOptions instead of startWithPort
建议使用 webServer.startWithOptions(["BindToLocalhost":true,"Port":xxxx]) 来避免提示允许监听端口
2016-10-02 01:24:38 +08:00
25f8319e85 Update version number from 1.2 to 1.3 2016-10-02 01:19:17 +08:00
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
7076523cbd Merge branch 'pr/44' into develop 2016-10-02 00:08:33 +08:00
9c24595486 show running mode on status bar 2016-10-01 12:45:42 +08:00
03244a8ed7 Typo fix 2016-09-28 13:57:04 +08:00
ff0ab584e9 bug fixs 2016-09-08 21:11:22 +08:00
9aaf6940e2 菜单现在显示实际使用中的服务器名
菜单现在显示实际使用中的服务器名
2016-09-08 18:47:01 +08:00
ff4cda30c1 Revert "Fix typo"
This reverts commit bdb3017910.
2016-09-01 16:35:12 +08:00
bdb3017910 Fix typo
Fix typo
2016-08-26 22:47:05 +08:00
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
66b0b622f0 add stop pac server method
add stop pac server method to avoid switch pac file failure
2016-08-24 11:52:40 +08:00
f64798504c Fix typo
Fix typo
2016-08-23 19:40:05 +08:00
9c0c8e219a Merge branch 'pr/41' into develop 2016-08-23 17:34:19 +08:00
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
671816b592 auto active service when create first server profile 2016-08-22 23:26:04 +08:00
4f982d48e0 prevent remove all servers 2016-08-22 23:17:31 +08:00
689693e42d shakewindows 2016-08-22 23:10:33 +08:00
f9f342d7cf Merge pull request #36 from alejx/patch-1
Fix some misspelled words.
2016-08-13 11:27:35 +08:00
d8644e4e84 Fix some misspelled words. 2016-08-13 11:21:02 +08:00
c43ed478fd Merge remote-tracking branch 'qiuyuzhou/develop' into develop 2016-08-08 22:08:20 +08:00
f03287ec0e Merge branch 'release/1.2' 2016-08-04 16:48:03 +08:00
b874a9dc23 Resize server profiles list in the preferences window. 2016-08-04 16:47:00 +08:00
9068970c35 Resize server profiles list in the preferences window. 2016-08-04 00:55:03 +08:00
245770afcf Fix bug #24
避免清空不是由ShadowsocksX-NG设置代理配置。
2016-08-04 00:41:00 +08:00
f096ed2b23 Merge branch 'feature/bug23' into develop 2016-08-03 23:51:55 +08:00
2d69aedd17 Merge branch 'pr/21' into develop 2016-08-03 23:51:07 +08:00
7e1dc05b17 Fix bug #23: 没有~/Library/LaunchAgents文件夹启动故障 2016-08-03 23:45:46 +08:00
fecc4a9ef5 revert unneed changes 2016-08-02 13:43:51 +08:00
995d43a41e add edit user rule window 2016-08-01 15:28:59 +08:00
9e0c650e33 Update README 2016-07-10 18:36:22 +08:00
8c1ea5dd38 Merge pull request #14 from jackwish/develop
Move PAC & QRCode menu items to level 2 menu
2016-07-10 18:08:31 +08:00
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
03cefc5099 Support drag & drop reorder the server profiles. 2016-07-09 15:10:05 +08:00
6c40f8c167 Change version number to 1.2 2016-07-07 15:56:55 +08:00
810479a40b Fix Assets.xcassets 2016-07-07 15:56:24 +08:00
65af97edae Show current proxy mode on top menu item. 2016-07-07 15:51:27 +08:00
7ab319e23e Merge branch 'release/1.1' 2016-07-06 19:50:34 +08:00
f1e264ae47 Localize advance proxy preferences panel. 2016-07-06 13:18:07 +08:00
e1ec9d7c8e Localization 2016-07-06 12:36:31 +08:00
e41a130c1c Change ss port minimum limit from 128 to 1. 2016-07-01 16:09:48 +08:00
ea4e006133 Advance preference for proxy.
Manual spesify network services which would be configure.
2016-06-30 02:33:37 +08:00