Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-31 06:13:46 +00:00
Code Releases Activity
220 Commits 7 Branches 17 Tags
v1.4-alpha
Commit Graph
66 Commits
Author SHA1 Message Date
Charlie Qiu 0ac549ad04 Add kcptun adv preferences. 2017-01-15 23:02:17 +08:00
Qiu Yuzhou fa5e5140e7 Merge branch 'develop' into fix 2017-01-13 10:39:05 +08:00
Charlie Qiu dc1fa683d6 Optimalize order of menu items. 2017-01-13 01:00:01 +08:00
Qiu Yuzhou 57fce4c25d Merge branch 'develop' into fix 2017-01-13 00:14:24 +08:00
Charlie Qiu 29c6bf8c3a Reset constraint for preferences. 2017-01-12 19:20:38 +08:00
Charlie Qiu fbd5d3b8a2 Support configure kcptun mtu. 2017-01-12 15:31:23 +08:00
Charlie Qiu ad938a355a Add KcptunProfile. 2017-01-12 15:04:08 +08:00
Nobel 58c5befa04 Merge branch 'master' of https://github.com/shadowsocks/ShadowsocksX-NG into fix 
# Conflicts:
#	ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib
 2017-01-10 17:05:30 +08:00
Nobel 6175ec2888 CustomSetting 2017-01-10 17:04:18 +08:00
Charlie Qiu c63f6b2ee3 Merge branch 'pr/159' into develop 
# Conflicts:
#	ShadowsocksX-NG/Base.lproj/MainMenu.xib
 2017-01-10 15:23:13 +08:00
Charlie Qiu 500e524d05 Merge branch 'pr/95' into develop 2017-01-10 14:21:39 +08:00
Charlie Qiu 0acfc98474 Merge branch 'pr/197' into develop 
# Conflicts:
#	ShadowsocksX-NG/ServerProfile.swift
 2017-01-10 14:14:54 +08:00
Rizwan 35d764fe2a [ADD] option to duplicate server profile on preference 2017-01-05 18:26:33 +08:00
imnotpopo 0b4bc25373 Update Localizable.strings 
fix typo
 2016-12-20 17:52:18 +08:00
imnotpopo 417f8f8457 Update HTTPPreferencesWindowController.xib 
fix typo
 2016-12-20 17:51:27 +08:00
imnotpopo d6b74afdc9 Update AdvPreferencesWindowController.xib 
fix typo
 2016-12-20 17:50:46 +08:00
imnotpopo 8ca67b8ece Update Localizable.strings 
Fixed typo
 2016-12-20 17:43:03 +08:00
imnotpopo a71f31705c Update AdvPreferencesWindowController.xib 
fixed typo
 2016-12-20 17:41:09 +08:00
Vicent Tsai 23967eca20 Added global Keyboard shortcut 
So we could switch between different proxy modes with global shortcut.
 2016-12-11 15:39:56 +08:00
Charlie Qiu cc342df5b5 Merge branch 'pr/116' into develop 2016-11-03 23:36:34 +08:00
Charlie Qiu 1ef2d7b909 Fix spell error. 
Listien -> Listen
 2016-11-03 09:30:04 +08:00
Julien Schmidt e6cdfbbc26 Fix typo 
Globel -> Global
 2016-10-26 19:32:27 +08:00
Charlie Qiu 082c25f5e2 Fix bug. http preferences 输入框bind需要启用：continuously updates value 2016-10-20 10:58:26 +08:00
Julien Schmidt e4236f21a1 Corrected Spellings 2016-10-20 01:14:47 +08:00
qinyuhang 15193a978d fix storyboard merge problem 
那三个按钮是灰色的大概是因为merge的时候storyboard 文件冲突
 2016-10-20 00:30:33 +08:00
Charlie Qiu a85fc4e3b4 Disable the rich text attribute of the user pac fule edit control. 2016-10-19 00:26:16 +08:00
Charlie Qiu d0ad272198 Refactor pac proxy. 2016-10-18 23:35:17 +08:00
qinyuhang 52a32a68af UI fix 2016-10-18 00:20:13 +08:00
qinyuhang 327609c840 批量导入导出配置文件功能 for Swift 3 
已解决冲突问题，请Merge
 2016-10-17 23:28:22 +08:00
Charlie Qiu 54ad13ec08 Some UI fixes. 
- Center all dialogs.
- Fix pac listen port input field format.
 2016-10-14 23:44:14 +08:00
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
王晨 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 7076523cbd Merge branch 'pr/44' into develop 2016-10-02 00:08:33 +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
Yicheng 4f982d48e0 prevent remove all servers 2016-08-22 23:17:31 +08:00
Charlie Qiu b874a9dc23 Resize server profiles list in the preferences window. 2016-08-04 16:47:00 +08:00
Charlie Qiu 9068970c35 Resize server profiles list in the preferences window. 2016-08-04 00:55:03 +08:00
bjzhou1990 fecc4a9ef5 revert unneed changes 2016-08-02 13:43:51 +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 f1e264ae47 Localize advance proxy preferences panel. 2016-07-06 13:18:07 +08:00
Charlie Qiu e41a130c1c Change ss port minimum limit from 128 to 1. 2016-07-01 16:09:48 +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
Charlie Qiu 1380f245d5 Fix spell errors. Rename all 'Shadowsocks-NE' to 'Shadowsocks-NG' 2016-06-25 15:00:03 +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