Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-23 00:13:42 +00:00
Code Releases Activity
179 Commits 7 Branches 17 Tags
8f5fdcdec66ad897380fa7389120d6bd129f8751
Commit Graph
179 Commits
This Branch
This Branch
All Branches
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 9c30b67500 Merge branch 'shadowsocks/develop' into swift3-syntax 2016-10-02 20:42:13 +08:00
Charlie Qiu cc467c4df2 Update travis to use image xocde8 instead of xocde7.3 2016-10-02 15:14:09 +08:00
qinyuhang bfa617be6f Merge branch 'shadowsocks/develop' into swift3-syntax 2016-10-02 09:12:24 +08:00
qinyuhang 5e14ad3fb0 update alamo fire to 4.0.1 2016-10-02 08:07:09 +08:00
qinyuhang 0922622962 Merge branch 'develop' into swift3-syntax 2016-10-02 07:42:09 +08:00
Charlie Qiu dff5679dcb Update requirements in readme. 2016-10-02 02:11:09 +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
Qiu Yuzhou 07532daac2 Merge pull request #73 from whao/patch-1 
Typo fix
 2016-10-02 01:26:55 +08:00
Charlie Qiu b389dc226c Call webServer startWithOptions instead of startWithPort 
建议使用 webServer.startWithOptions(["BindToLocalhost":true,"Port":xxxx]) 来避免提示允许监听端口
 2016-10-02 01:24:38 +08:00
Charlie Qiu 25f8319e85 Update version number from 1.2 to 1.3 2016-10-02 01:19:17 +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 3cc08fba57 bump up version 2016-09-29 08:04:26 +08:00
Wei Hao 03244a8ed7 Typo fix 2016-09-28 13:57:04 +08:00
qinyuhang 34db2cb9ca convert project file from swift2.3 to swift3.0 2016-09-22 20:17:12 +08:00
qinyuhang d7ddd286cc upgrade alamofire from 3.5 to 4.0 2016-09-22 20:16:48 +08:00
qinyuhang 5825234b7f fix travis ci build fail problem 2016-09-22 19:29:50 +08:00
qinyuhang 86fc0a7000 更新 ss-local 支持auth_sha1_v4 
更新 ss-local 支持auth_sha1_v4
更新安装 ss-local 脚本
 2016-09-22 19:15:59 +08:00
qinyuhang 7167775536 fix ss-local permission problem 2016-09-18 11:25:33 +08:00
qinyuhang 2f38f95f55 fix bug 
修正服务器设置面板不能拷贝到剪切板的bug
重新组织了AppDelegate的结构
修正travis-ci报错问题
 2016-09-15 16:22:02 +08:00
qinyuhang 8f23900bc6 Update network monitor to swift 2.3 2016-09-14 12:20:32 +08:00
qinyuhang 5ec413b282 Update alamofire to 3.5 to work with Xcode 8 2016-09-14 09:43:34 +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 38ece2f86c Remove BunchImportUtils.swift 2016-09-12 15:39:23 +08:00
qinyuhang ba9aebab4e 代码重构 
代码重构，将导入导出功能移动到ServerProfileManager类下，移除BunchImportUtils.swift
 2016-09-12 15:38:56 +08:00
qinyuhang 6c5af29cc2 修正问题 
1. 修正Ping test最后通知最快的并不是实际最快的服务器
2. 临时移除 macOS 10.12 Sierra 网速显示的功能，将会有一个提示
 2016-09-12 08:16:30 +08:00
qinyuhang 930ee272b4 New dark mode icon 2016-09-12 08:01:08 +08:00
qinyuhang f150f720ea fix typo 2016-09-09 20:15:36 +08:00
qinyuhang d640593fbf 中文化 2016-09-09 20:14:36 +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
秦宇航 648ec753e8 Merge pull request #15 from qinyuhang/yichengchen-ssr 
try merge yichengchen/ssr
 2016-09-09 12:56:24 +08:00
qinyuhang 48a46d79e2 try merge yichengchen/ssr 2016-09-09 12:51:37 +08:00
qinyuhang 28961a39fa fix up firewall permission request 2016-09-09 11:05:40 +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 706d8e54f4 fix sign problem 2016-09-08 20:20:36 +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 ff4cda30c1 Revert "Fix typo" 
This reverts commit bdb3017910.
 2016-09-01 16:35:12 +08:00
qinyuhang f338698043 update signature setting 2016-09-01 14:34:15 +08:00
qinyuhang 63ad13af87 Make import and export panel top window 
Make import and export panel top window
 2016-08-30 17:49:55 +08:00
qinyuhang 2bb5579e57 open Finder after export configs 2016-08-28 11:31:54 +08:00
qinyuhang 695083602e Bump version 2016-08-28 08:34:03 +08:00