ShadowsocksX-NG-R

Alawn/ShadowsocksX-NG-R

Fork 0

mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-15 09:14:11 +00:00

Commit Graph

Select branches

Hide Pull Requests

develop

feature/subscribe

feature_swift_5

fix_QR_GPU

master

release/1.4.0

rm

#12

#139

#149

#149

#150

#152

#152

#153

#153

#161

#32

1.0

1.1

1.2

1.3

1.3.1

1.3.2

1.4.2-R8

1.4.2-R8-fix-subscribe

1.4.3-R8

1.4.3-R8-build2

1.4.3-R8-build3

1.4.4-r8

1.4.4-r8-resigning

v1.0-beta

v1.0-beta2

v1.4-alpha

v1.4-beta

cc3b016a51 Update PreferencesWindowController.strings imnotpopo 2016-12-20 17:52:58 +08:00
0b4bc25373 Update Localizable.strings imnotpopo 2016-12-20 17:52:18 +08:00
417f8f8457 Update HTTPPreferencesWindowController.xib imnotpopo 2016-12-20 17:51:27 +08:00
d6b74afdc9 Update AdvPreferencesWindowController.xib imnotpopo 2016-12-20 17:50:46 +08:00
8ca67b8ece Update Localizable.strings imnotpopo 2016-12-20 17:43:03 +08:00
a71f31705c Update AdvPreferencesWindowController.xib imnotpopo 2016-12-20 17:41:09 +08:00
cf4fb9a75e Update PreferencesWindowController.strings imnotpopo 2016-12-20 17:37:59 +08:00
0c3c021f21 Merge branch 'feature/global_shortcut' into develop Vicent Tsai 2016-12-11 17:21:07 +08:00
4dd3bd495e Update Alamofire to 4.2.0 with new version of Xcode 8.1 Vicent Tsai 2016-12-11 17:17:36 +08:00
23967eca20 Added global Keyboard shortcut Vicent Tsai 2016-12-11 15:39:56 +08:00
37e157b024 Sync server name menu when server preference changed. Nobel 2016-12-05 10:46:51 +08:00
857a6c9883 build static libpcre into ss-local qinyuhang 2016-11-16 09:04:24 +08:00
cc342df5b5 Merge branch 'pr/116' into develop Charlie Qiu 2016-11-03 23:36:34 +08:00
1ef2d7b909 Fix spell error. Charlie Qiu 2016-11-03 09:30:04 +08:00
9e231a7b34 Merge branch 'release/1.3.2' 1.3.2 Charlie Qiu 2016-11-01 11:36:46 +08:00
2a5507bb84 fix aes128_md5 & aes128_sha1 problem qinyuhang 2016-10-30 19:32:20 +08:00
67d39ecbbf fix ssr QR code scan problem qinyuhang 2016-10-30 19:26:41 +08:00
c4574b644a update xcode project settings qinyuhang 2016-10-30 18:35:44 +08:00
e6cdfbbc26 Fix typo Julien Schmidt 2016-10-26 19:25:35 +08:00
e0dfcfa8d5 update ss-local version to 2.5.4 qinyuhang 2016-10-24 13:10:44 +08:00
d7093eb0a2 sync ss-libev qinyuhang 2016-10-22 11:40:04 +08:00
13a0ba7390 bind continuously updates value Charlie Qiu 2016-10-20 10:58:26 +08:00
f1eabc735e fix cannot show current QR Charlie Qiu 2016-10-21 23:27:30 +08:00
381b9ce634 Update version number to 1.3.2 Charlie Qiu 2016-10-21 23:37:23 +08:00
cf2f5d1a9c Fix bug #106 by workaround. Charlie Qiu 2016-10-21 23:36:05 +08:00
d2b8ca1c97 Fix bug #104. Charlie Qiu 2016-10-21 23:27:30 +08:00
082c25f5e2 Fix bug. http preferences 输入框bind需要启用：continuously updates value Charlie Qiu 2016-10-20 10:58:26 +08:00
969c94eaff Merge branch 'pr/100' into develop Charlie Qiu 2016-10-20 08:31:33 +08:00
e4236f21a1 Corrected Spellings Julien Schmidt 2016-10-20 01:14:47 +08:00
15193a978d fix storyboard merge problem qinyuhang 2016-10-20 00:30:33 +08:00
299abfee7b Fix #98, Don't turn off when app Terminate. Charlie Qiu 2016-10-19 23:59:52 +08:00
7c4444e417 fix issue #51 qinyuhang 2016-10-19 14:39:00 +08:00
713bcae7b1 Merge branch 'release/1.3.1' 1.3.1 Charlie Qiu 2016-10-19 14:32:40 +08:00
3c77fc9fe9 Fix the project file. Charlie Qiu 2016-10-19 00:30:53 +08:00
53d41ad27b Update version number to 1.3.1 Charlie Qiu 2016-10-19 00:30:21 +08:00
a85fc4e3b4 Disable the rich text attribute of the user pac fule edit control. Charlie Qiu 2016-10-19 00:26:16 +08:00
e5b342c134 Monitor PAC file. Disable then enable the system pac configure after it has been modified. Charlie Qiu 2016-10-19 00:24:45 +08:00
d0ad272198 Refactor pac proxy. Charlie Qiu 2016-10-18 23:35:17 +08:00
7ad9dc42a0 Fix bug caused by pr #97 Charlie Qiu 2016-10-18 22:18:54 +08:00
5ed5789c31 Merge branch 'pr/97' into develop Charlie Qiu 2016-10-18 22:11:04 +08:00
c7211ceb19 Merge commit 'fc11cc78fd9ad96d026485e07e643c751ad4669b' into develop Charlie Qiu 2016-10-18 16:07:05 +08:00
fc11cc78fd Merge pull request #92 from linuxbelletian/master Qiu Yuzhou 2016-10-18 16:04:10 +08:00
dd20ebda68 fix crash problem qinyuhang 2016-10-18 15:36:56 +08:00
eefc1893c4 更新ss-libev修正tls1.2_ticket_auth发包问题 qinyuhang 2016-10-18 15:24:00 +08:00
52a32a68af UI fix qinyuhang 2016-10-18 00:20:13 +08:00
327609c840 批量导入导出配置文件功能 for Swift 3 qinyuhang 2016-09-12 17:05:28 +08:00
22d654dd69 defaults.array(forKey: "ServerProfiles") would return nil ,but not handle 田兵 2016-10-17 16:13:42 +08:00
8fa7f76faa Add a download link in readme. Qiu Yuzhou 2016-10-15 00:33:53 +08:00
8ba816300c Merge branch 'release/1.3' 1.3 Charlie Qiu 2016-10-15 00:02:18 +08:00
54ad13ec08 Some UI fixes. Charlie Qiu 2016-10-14 23:44:14 +08:00
91124b9e90 Merge branch 'pr/85' into develop Charlie Qiu 2016-10-14 23:39:11 +08:00
82de054b83 Merge branch 'pr/78' into develop Charlie Qiu 2016-10-13 14:46:58 +08:00
d4940ce9ae Bump build version qinyuhang 2016-10-12 14:33:59 +08:00
1eddfd48fa update recompiled privoxy 位敏 2016-10-10 20:47:24 +08:00
7d67ed04ec Merge pull request #44 from zhfish/feature/privoxy 秦宇航 2016-10-10 22:57:10 +08:00
73cab83c86 recompile privoxy within libpcre 位敏 2016-10-10 20:47:24 +08:00
4c295965f2 增加 HTTP代理跟随全局设置王晨 2016-10-09 14:31:13 +08:00
3f7e433dd2 更新两处http开关，随ss开启和关闭王晨 2016-10-08 17:16:02 +08:00
2ab6f95631 add privoxy 王晨 2016-10-07 17:52:30 +08:00
c0446a49ea fix crash on import json config file qinyuhang 2016-10-09 17:45:40 +08:00
f790b22516 Bump version qinyuhang 2016-10-09 15:12:30 +08:00
65a009eed6 修正menu bar 颜色问题 qinyuhang 2016-10-09 15:00:20 +08:00
dc9f045ec7 Merge pull request #37 from zhfish/feature/privoxy 秦宇航 2016-10-09 15:04:53 +08:00
e91eabfc5a 增加 HTTP代理跟随全局设置王晨 2016-10-09 14:31:13 +08:00
2420b8b1e3 更新两处http开关，随ss开启和关闭王晨 2016-10-08 17:16:02 +08:00
1de918d40c typo fix qinyuhang 2016-10-08 13:33:10 +08:00
4f985feae0 增加privacy 王晨 2016-10-07 17:52:30 +08:00
d26410aae6 bug fix qinyuhang 2016-10-07 10:50:03 +08:00
5815c29003 Set deployment target from 10.10 to 10.11 Charlie Qiu 2016-10-07 10:32:30 +08:00
e564405a8e Update travis ci status image to new link. Charlie Qiu 2016-10-06 15:05:35 +08:00
afa46d20b4 Merge branch 'swift3-syntax' into develop qinyuhang 2016-10-05 09:58:18 +08:00
b699d060af bug fix bestv 2016-10-04 08:57:53 +08:00
8f5fdcdec6 disable show MODE on system bar qinyuhang 2016-10-03 12:31:06 +08:00
20d76a0850 代理菜单内增加状态栏文本显示开关 bestv 2016-10-02 23:59:01 +08:00
9c30b67500 Merge branch 'shadowsocks/develop' into swift3-syntax qinyuhang 2016-10-02 20:42:13 +08:00
cc467c4df2 Update travis to use image xocde8 instead of xocde7.3 Charlie Qiu 2016-10-02 15:14:09 +08:00
bfa617be6f Merge branch 'shadowsocks/develop' into swift3-syntax qinyuhang 2016-10-02 09:12:24 +08:00
5e14ad3fb0 update alamo fire to 4.0.1 qinyuhang 2016-10-02 08:07:09 +08:00
0922622962 Merge branch 'develop' into swift3-syntax qinyuhang 2016-10-02 07:42:09 +08:00
dff5679dcb Update requirements in readme. Charlie Qiu 2016-10-02 02:11:09 +08:00
bfc39d8179 顶级菜单中服务器名前加上文字:服务器. Charlie Qiu 2016-10-02 01:45:59 +08:00
cb9d2b62ad Convert to swift 3 syntax. Charlie Qiu 2016-10-02 01:39:21 +08:00
294073011b Merge branch 'pr/75' into develop Charlie Qiu 2016-10-02 01:36:32 +08:00
cd5c724bb7 Merge branch 'pr/54' into develop Charlie Qiu 2016-10-02 01:34:48 +08:00
07532daac2 Merge pull request #73 from whao/patch-1 Qiu Yuzhou 2016-10-02 01:26:55 +08:00
b389dc226c Call webServer startWithOptions instead of startWithPort Charlie Qiu 2016-10-02 01:24:38 +08:00
25f8319e85 Update version number from 1.2 to 1.3 Charlie Qiu 2016-10-02 01:19:17 +08:00
7a7249b80f Update for swift 3. Charlie Qiu 2016-10-02 01:17:07 +08:00
7076523cbd Merge branch 'pr/44' into develop Charlie Qiu 2016-10-02 00:08:33 +08:00
9c24595486 show running mode on status bar bestv 2016-10-01 12:45:42 +08:00
3cc08fba57 bump up version qinyuhang 2016-09-27 08:19:52 +08:00
03244a8ed7 Typo fix Wei Hao 2016-09-28 13:57:04 +08:00
34db2cb9ca convert project file from swift2.3 to swift3.0 qinyuhang 2016-09-22 20:17:12 +08:00
d7ddd286cc upgrade alamofire from 3.5 to 4.0 qinyuhang 2016-09-22 20:16:48 +08:00
5825234b7f fix travis ci build fail problem qinyuhang 2016-09-22 19:29:50 +08:00
86fc0a7000 更新 ss-local 支持auth_sha1_v4 qinyuhang 2016-09-22 19:15:59 +08:00
7167775536 fix ss-local permission problem qinyuhang 2016-09-18 11:25:33 +08:00
2f38f95f55 fix bug qinyuhang 2016-09-15 16:22:02 +08:00
8f23900bc6 Update network monitor to swift 2.3 qinyuhang 2016-09-14 12:20:32 +08:00
5ec413b282 Update alamofire to 3.5 to work with Xcode 8 qinyuhang 2016-09-14 09:43:34 +08:00

... 3 4 5 6 7