Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-26 10:13:52 +00:00
Code Releases Activity
193 Commits 7 Branches 17 Tags
ad938a355a03271ec6429ffbe19eb803bbbf83bf
Commit Graph
133 Commits
Author SHA1 Message Date
Charlie Qiu ad938a355a Add KcptunProfile. 2017-01-12 15:04:08 +08:00
Charlie Qiu 361742ba38 [BUG] Update a new ss-local binary which support macos 12.11 
The old one only support macos 12.12
 2017-01-12 15:00:41 +08:00
Charlie Qiu 62648d02f1 Add a 'Copy' context menu to the QRCode window. 2017-01-12 11:58:57 +08:00
Charlie Qiu 1388c065c7 Send a system notification when not found valid qrcode of ss profile. 2017-01-12 11:45:57 +08:00
Charlie Qiu 5099e0bcc0 [BUG]Fixed decoding ss url. 
Base64 string may containe character '/'.
 2017-01-12 11:31:38 +08:00
Charlie Qiu 1de6fa0b5a [BUG]chmod +x install_helper.sh 2017-01-11 18:20:44 +08:00
Charlie Qiu cb4e6d7f19 Monitor pac file with GCD instead of FSEventStreamCreate. 
Old approach is not working on new version MacOS.
 2017-01-11 10:43:37 +08:00
Charlie Qiu 78f0aa9c63 Add new encrypt methods to the selector list. 2017-01-10 17:50:59 +08:00
Charlie Qiu 43f6bd6c4b Update ss-local from 2.4.6 to 2.5.6 2017-01-10 17:28:16 +08:00
Charlie Qiu 208e9d03f5 Merge branch 'pr/95' into develop 
# Conflicts:
#	ShadowsocksX-NG.xcodeproj/project.pbxproj
 2017-01-10 15:53:50 +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
qinyuhang 1e4ad0b108 add examplejson to Xcode project file 
add examplejson to Xcode project file
fix resource method
 2017-01-10 15:02:54 +08:00
Charlie Qiu 500e524d05 Merge branch 'pr/95' into develop 2017-01-10 14:21:39 +08:00
Charlie Qiu 8f2267950f Merge branch 'pr/154' into develop 2017-01-10 14:17:48 +08:00
Charlie Qiu 0acfc98474 Merge branch 'pr/197' into develop 
# Conflicts:
#	ShadowsocksX-NG/ServerProfile.swift
 2017-01-10 14:14:54 +08:00
Charlie Qiu 845c554330 Merge branch 'pr/198' into develop 2017-01-10 12:31:51 +08:00
Rainux Luo dbc6ee92d5 Refactor ParseSSURL as ServerProfile initializer 2017-01-09 22:01:05 +08:00
Rainux Luo c50e18d832 Support generate SS URL with Remark and OTA 2017-01-09 18:16:44 +08:00
Rainux Luo 9dafb4fb79 Add tests for ServerProfile 2017-01-09 18:16:44 +08:00
Rainux Luo 5e06b4b4f0 Support parse SS URL with query string 
So we can encode Remark and OTA to query string
 2017-01-09 18:16:35 +08:00
Rainux Luo faf029c7f7 Parse SS URL with much cleaner URL struct methods 2017-01-08 23:36:47 +08:00
Rizwan 59e3de1697 [ADD] localised text 2017-01-05 18:52:39 +08:00
Rizwan 35d764fe2a [ADD] option to duplicate server profile on preference 2017-01-05 18:26:33 +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
imnotpopo cf4fb9a75e Update PreferencesWindowController.strings 
fix typo
 2016-12-20 17:37:59 +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
Nobel 37e157b024 Sync server name menu when server preference changed. 2016-12-05 10:46:51 +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 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
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 299abfee7b Fix #98, Don't turn off when app Terminate. 2016-10-19 23:59:52 +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
qinyuhang dd20ebda68 fix crash problem 2016-10-18 15:36:56 +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
田兵 22d654dd69 defaults.array(forKey: "ServerProfiles") would return nil ,but not handle 2016-10-17 16:13:42 +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