Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-28 19:53:49 +00:00
Code Releases Activity
363 Commits 7 Branches 17 Tags
develop
Commit Graph
109 Commits
Author SHA1 Message Date
qinyuhang 8f5fdcdec6 disable show MODE on system bar 
disable show MODE on system bar, current solution is taking too much
space, we need new solution
 2016-10-03 12:31:06 +08:00
qinyuhang bfa617be6f Merge branch 'shadowsocks/develop' into swift3-syntax 2016-10-02 09:12:24 +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 34db2cb9ca convert project file from swift2.3 to swift3.0 2016-09-22 20:17:12 +08:00
qinyuhang 2f38f95f55 fix bug 
修正服务器设置面板不能拷贝到剪切板的bug
重新组织了AppDelegate的结构
修正travis-ci报错问题
 2016-09-15 16:22:02 +08:00
qinyuhang 8244c6307f bump up version 2016-09-14 07:38:53 +08:00
qinyuhang 83df982029 增加 打开时自动连接 选项 2016-09-12 16:09:39 +08:00
qinyuhang ba9aebab4e 代码重构 
代码重构，将导入导出功能移动到ServerProfileManager类下，移除BunchImportUtils.swift
 2016-09-12 15:38:56 +08:00
qinyuhang b6d86a1b07 fix dark mode display bug 2016-09-09 15:09:22 +08:00
qinyuhang 2c1894e255 Add Ping result in main menu 2016-09-09 13:59:53 +08:00
qinyuhang 48a46d79e2 try merge yichengchen/ssr 2016-09-09 12:51:37 +08:00
qinyuhang ca38c9a2a2 Merge branch 'display-server-in-menu' into develop 2016-09-08 21:11:42 +08:00
qinyuhang ff0ab584e9 bug fixs 2016-09-08 21:11:22 +08:00
qinyuhang f956740150 Merge branch 'display-server-in-menu' into develop 2016-09-08 18:49:07 +08:00
qinyuhang 9aaf6940e2 菜单现在显示实际使用中的服务器名 
菜单现在显示实际使用中的服务器名
 2016-09-08 18:47:01 +08:00
qinyuhang 303cc41016 finish export function 
finish export function
fix issue https://github.com/qinyuhang/ShadowsocksX-NG/issues/8
 2016-08-28 08:24:33 +08:00
qinyuhang 6df2715651 Update Localization 
Update Localization
 2016-08-27 17:07:15 +08:00
qinyuhang a48805d687 Finish import function 
Finish import function
TODO: export function & show example config function
 2016-08-27 09:47:25 +08:00
qinyuhang 4e255921b5 add menu button 
add menu button
 2016-08-26 13:32:05 +08:00
qinyuhang abfa8c78e1 Merge remote-tracking branch 'qiuyuzhou/develop' into develop 
# Conflicts:
#	ShadowsocksX-NG/PreferencesWindowController.swift
add fix duplicate profile error
 2016-08-25 12:41:37 +08:00
qinyuhang 020ad8b2cf add adv setting for local PAC server 
add adv setting for local PAC server
 2016-08-25 10:01:22 +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 bc7ca9eb0e merge from hotfix-macOS10.12 
add local server to serve PAC file, this works on macOS 10.12 PAC mode
 2016-08-23 20:37:35 +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
qinyuhang eddb2d4f82 Update duplicate icons 
Update duplicate icons
Fix up force quite app ss-local still running background
 2016-08-23 10:41:04 +08:00
Yicheng 671816b592 auto active service when create first server profile 2016-08-22 23:26:04 +08:00
qinyuhang 1a8c171493 Update Readme 
Update Readme
Remove Protocol auth_simple
 2016-08-22 00:30:09 +08:00
qinyuhang eae605910c 新增加白名单模式 
新增白名单模式，白名单来自破娃酱
注意事项，替换白名单中proxy的地址时发现原来的IP白名单中 wall_proxy 只有 socks5，而域名白名单中 wall_proxy
有 socks 和 socks5（只有这样才会work）。故此在后面的处理替换中将两个都加上了。后续变化，还需要看破娃酱 white list
具体变化。
 2016-08-14 00:40:14 +08:00
qinyuhang be51992ba8 init white list 2016-08-13 16:59:26 +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