Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-16 18:19:42 +00:00
Code Releases Activity
153 Commits 7 Branches 17 Tags
87c19ea2a1b320090e7c6d1ff6bf1f302deeecb7
Commit Graph
153 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Qiu Yuzhou 87c19ea2a1 Set theme jekyll-theme-slate 2017-01-17 11:18:03 +08:00
Qiu Yuzhou dcce6cfce5 Merge pull request #170 from imnotpopo/master 
fix typo
 2017-01-10 12:22:49 +08:00
imnotpopo cc3b016a51 Update PreferencesWindowController.strings 
fix typo
 2016-12-20 17:52:58 +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
Charlie Qiu 9e231a7b34 Merge branch 'release/1.3.2' 1.3.2 2016-11-01 11:36:46 +08:00
Charlie Qiu 381b9ce634 Update version number to 1.3.2 2016-10-21 23:37:23 +08:00
Charlie Qiu cf2f5d1a9c Fix bug #106 by workaround. 2016-10-21 23:36:05 +08:00
Charlie Qiu 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
Charlie Qiu 082c25f5e2 Fix bug. http preferences 输入框bind需要启用：continuously updates value 2016-10-20 10:58:26 +08:00
Charlie Qiu 969c94eaff Merge branch 'pr/100' into develop 2016-10-20 08:31:33 +08:00
Julien Schmidt e4236f21a1 Corrected Spellings 2016-10-20 01:14:47 +08:00
Charlie Qiu 299abfee7b Fix #98, Don't turn off when app Terminate. 2016-10-19 23:59:52 +08:00
Charlie Qiu 713bcae7b1 Merge branch 'release/1.3.1' 1.3.1 2016-10-19 14:32:40 +08:00
Charlie Qiu 3c77fc9fe9 Fix the project file. 2016-10-19 00:30:53 +08:00
Charlie Qiu 53d41ad27b Update version number to 1.3.1 2016-10-19 00:30:21 +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 e5b342c134 Monitor PAC file. Disable then enable the system pac configure after it has been modified. 2016-10-19 00:24:45 +08:00
Charlie Qiu d0ad272198 Refactor pac proxy. 2016-10-18 23:35:17 +08:00
Charlie Qiu 7ad9dc42a0 Fix bug caused by pr #97 2016-10-18 22:18:54 +08:00
Charlie Qiu 5ed5789c31 Merge branch 'pr/97' into develop 
# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift
 2016-10-18 22:11:04 +08:00
Charlie Qiu c7211ceb19 Merge commit 'fc11cc78fd9ad96d026485e07e643c751ad4669b' into develop 2016-10-18 16:07:05 +08:00
Qiu Yuzhou fc11cc78fd Merge pull request #92 from linuxbelletian/master 
defaults.array(forKey: "ServerProfiles")  would return nil ,but not h…
 2016-10-18 16:04:10 +08:00
qinyuhang 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
Qiu Yuzhou 8fa7f76faa Add a download link in readme. 2016-10-15 00:33:53 +08:00
Charlie Qiu 8ba816300c Merge branch 'release/1.3' 1.3 2016-10-15 00:02:18 +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
Charlie Qiu 82de054b83 Merge branch 'pr/78' into develop 2016-10-13 14:46:58 +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
Charlie Qiu 5815c29003 Set deployment target from 10.10 to 10.11 2016-10-07 10:32:30 +08:00
Charlie Qiu e564405a8e Update travis ci status image to new link. 2016-10-06 15:05:35 +08:00
bestv b699d060af bug fix 2016-10-04 08:57:53 +08:00
bestv 20d76a0850 代理菜单内增加状态栏文本显示开关 2016-10-02 23:59:01 +08:00
Charlie Qiu cc467c4df2 Update travis to use image xocde8 instead of xocde7.3 2016-10-02 15:14: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