Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-10-20 14:34:30 +00:00
Code Releases Activity
173 Commits 7 Branches 17 Tags
8f2267950ff8d307e44a569791b4afa12bf8ce69
Commit Graph
173 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Charlie Qiu 5ff740a9a9 Merge commit 'dcce6cfce569108520fe32fed9d65e18e3157e09' into develop 2017-01-10 12:26:10 +08:00
Qiu Yuzhou dcce6cfce5 Merge pull request #170 from imnotpopo/master 
fix typo
 2017-01-10 12:22:49 +08:00
Qiu Yuzhou 638f701e9c Merge pull request #171 from imnotpopo/develop 
fix typo
 2017-01-10 12:21:31 +08:00
Rainux Luo dfb06cdf70 Refactor tests as well 2017-01-09 22:04:56 +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
Rainux Luo 97801c4ee6 Add tests for ParseSSURL() 2017-01-07 12:30:12 +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 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
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
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
Charlie Qiu 9e231a7b34 Merge branch 'release/1.3.2' 1.3.2 2016-11-01 11:36:46 +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
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