Commit Graph

98 Commits

Author SHA1 Message Date
cf2f5d1a9c Fix bug #106 by workaround. 2016-10-21 23:36:05 +08:00
d2b8ca1c97 Fix bug #104.
Implement show qrcode by core image generator instead of embed a web view.
2016-10-21 23:27:30 +08:00
082c25f5e2 Fix bug. http preferences 输入框bind需要启用:continuously updates value 2016-10-20 10:58:26 +08:00
e4236f21a1 Corrected Spellings 2016-10-20 01:14:47 +08:00
299abfee7b Fix #98, Don't turn off when app Terminate. 2016-10-19 23:59:52 +08:00
53d41ad27b Update version number to 1.3.1 2016-10-19 00:30:21 +08:00
a85fc4e3b4 Disable the rich text attribute of the user pac fule edit control. 2016-10-19 00:26:16 +08:00
e5b342c134 Monitor PAC file. Disable then enable the system pac configure after it has been modified. 2016-10-19 00:24:45 +08:00
d0ad272198 Refactor pac proxy. 2016-10-18 23:35:17 +08:00
7ad9dc42a0 Fix bug caused by pr #97 2016-10-18 22:18:54 +08:00
5ed5789c31 Merge branch 'pr/97' into develop
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift
2016-10-18 22:11:04 +08:00
dd20ebda68 fix crash problem 2016-10-18 15:36:56 +08:00
22d654dd69 defaults.array(forKey: "ServerProfiles") would return nil ,but not handle 2016-10-17 16:13:42 +08:00
54ad13ec08 Some UI fixes.
- Center all dialogs.
- Fix pac listen port input field format.
2016-10-14 23:44:14 +08:00
91124b9e90 Merge branch 'pr/85' into develop
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift
2016-10-14 23:39:11 +08:00
1eddfd48fa update recompiled privoxy 2016-10-10 23:01:13 +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
20d76a0850 代理菜单内增加状态栏文本显示开关 2016-10-02 23:59:01 +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
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
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
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
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
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