Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,069 Commits 7 Branches 37 Tags
f7cd2390b24a1e94de000f1725d729b5801e2255
Commit Graph
1069 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
clowwindy b1ebfe7772 prevent moving up and down when unsaved 2015-08-19 19:35:37 -07:00
kimw f6085d9362 Merge remote-tracking branch 'upstream/master' 2015-08-19 18:39:23 +08:00
kimw 0b6dd0d653 refresh server list with friendly name 2015-08-19 18:38:11 +08:00
clowwindy 7081819390 timeout 30min -> 15min 2015-08-19 13:05:12 +08:00
kimw 1df5e4eb8a Merge remote-tracking branch 'upstream/master' 2015-08-19 00:30:29 +08:00
kimw 758c497eba same the source code format. 
1/ removed dual empty line
2/ removed tailing spaces
3/ converted tabs into spaces
4/ added some TODO comments
 2015-08-19 00:24:08 +08:00
kimw 3e1044fc41 rename variable _oldSelectedIndex to _lastSelectedIndex 2015-08-19 00:22:23 +08:00
kimw feaf7f70d0 fix translation typo 2015-08-19 00:20:39 +08:00
clowwindy e21eac1e40 Merge pull request #296 from kimw/master 
support customize the server order
 2015-08-18 08:55:38 -07:00
clowwindy 750ee4fa5f add handler timeout 2015-08-18 21:34:05 -07:00
clowwindy 3bc77d212a reduce cache size 2015-08-18 21:34:04 -07:00
kimw b623216af3 Merge remote-tracking branch 'upstream/master' 2015-08-18 23:51:53 +08:00
kimw f33fb04b89 support customize the server order 2015-08-18 23:48:52 +08:00
clowwindy 63b31f5aba fix translation 2015-08-18 05:07:38 +08:00
clowwindy 590322bca2 fix some translation 2015-08-18 05:07:04 +08:00
clowwindy 71bd0d2b5a improve user experience for some users 2015-08-18 04:26:11 -07:00
clowwindy 3b90b2124f Update README.md 2015-08-17 21:03:11 +08:00
clowwindy 85dc46d11e Update README.md 2015-08-17 20:55:01 +08:00
clowwindy fe692f89e1 Update README.md 2015-08-17 20:46:51 +08:00
clowwindy e84825c25d fix a path problem 2.5.5 2015-08-17 20:19:21 -07:00
clowwindy 05726cdb67 revert part of #257 2015-08-17 20:00:24 -07:00
clowwindy ab38538b34 allow multiple instances 2015-08-17 19:49:49 -07:00
clowwindy 4f92fabc88 Merge pull request #289 from PINK-FL0YD/patch-1 
Update UpdateChecker.cs
 2015-08-17 17:27:13 +08:00
Pink Floyd 9522d1d17b Update UpdateChecker.cs 
Update UpdateURL
 2015-08-17 17:24:35 +08:00
clowwindy 36c61b7dd5 Merge pull request #283 from icylogic/hotfix/PingException 
hotfix/PingException
 2015-08-17 11:59:33 +08:00
icylogic 90f8b1257a Merge remote-tracking branch 'upstream/master' 2015-08-17 11:34:14 +08:00
icylogic 7978817492 fixed #280, log "No such host is known" and other PingException 2015-08-17 11:32:03 +08:00
icylogic 99baeb89f3 log "No such host is known" exception 2015-08-17 11:28:41 +08:00
clowwindy 1b8584e6e1 Update README.md 2015-08-17 10:57:59 +08:00
clowwindy 9085480d0b Merge pull request #279 from cicku/patch-1 
Add gfwlist links
 2015-08-17 10:57:20 +08:00
icylogic 6375a3d4a8 Merge branch 'master' into feature/statistics_ui 2015-08-17 10:42:36 +08:00
Christopher Meng 23b90b8697 Add gfwlist links 
Various fixes accompanied.
 2015-08-17 08:43:03 +08:00
clowwindy 2449d2a5df Update README.md 2015-08-16 22:15:06 +08:00
clowwindy e8cbd92a8e update CHANGES 2.5.4 2015-08-16 22:05:12 -07:00
clowwindy b4647e5b15 bump 2015-08-16 22:04:25 -07:00
clowwindy 7d2c292034 prevent privoxy from showing tray icon 2015-08-16 22:04:24 -07:00
icylogic bf1c79304e Basic user controls 2015-08-16 20:07:51 +08:00
clowwindy cd49ca88a2 Update README.md 2015-08-16 19:23:10 +08:00
clowwindy a3f724a1dc Update CHANGES 2015-08-16 18:26:28 +08:00
clowwindy b238aaf8cc bump 2.5.3 2.5.3 2015-08-16 18:17:53 -07:00
clowwindy 674e120af3 fix proj 2015-08-16 18:17:22 -07:00
clowwindy fdf91705ac minor fixes 2015-08-16 18:13:08 -07:00
clowwindy 4e01a40dd8 replace polipo with privoxy 2015-08-16 18:07:05 -07:00
clowwindy 766b9aac56 revert gc 2015-08-16 15:46:57 -07:00
clowwindy 4e9113a7b5 Update README.md 2015-08-15 01:39:48 +08:00
icylogic 453b5f5fa4 ignore settings for resharper 2015-08-13 18:49:33 +08:00
icylogic 93432d24cf add packages 2015-08-13 18:34:52 +08:00
icylogic 34ab170e4c fix serveral minor bugs 2015-08-13 18:29:17 +08:00
icylogic 2382282c92 refactor code and fix a potential bug. 2015-08-13 04:38:15 +08:00
icylogic d40b467e96 nuget package 2015-08-13 04:12:14 +08:00