Commit Graph
37 Commits
Author SHA1 Message Date
icylogic a30cb166a5 Merge branch 'hotfix/more_clear_log' into develop
# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
2015-09-02 01:41:16 +08:00
icylogic 879163dc2b Add more clear log 2015-09-02 01:23:32 +08:00
icylogic aa2334c9fd Merge branch 'master' into feature/statistics_ui
# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
#	shadowsocks-csharp/View/LogForm.Designer.cs
#	shadowsocks-csharp/View/MenuViewController.cs
2015-09-02 00:51:14 +08:00
clowwindy b8858c4f8d bump 2.5.6 2015-08-19 22:19:20 -07:00
clowwindy c767f55b3c add portable mode 2015-08-19 21:39:06 -07:00
kimw f6085d9362 Merge remote-tracking branch 'upstream/master' 2015-08-19 18:39:23 +08:00
clowwindy 7081819390 timeout 30min -> 15min 2015-08-19 13:05:12 +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
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
clowwindy 71bd0d2b5a improve user experience for some users 2015-08-18 04:26:11 -07:00
clowwindy e84825c25d fix a path problem 2015-08-17 20:19:21 -07:00
Pink Floyd 9522d1d17b Update UpdateChecker.cs
Update UpdateURL
2015-08-17 17:24:35 +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
icylogic 6375a3d4a8 Merge branch 'master' into feature/statistics_ui 2015-08-17 10:42:36 +08:00
clowwindy b4647e5b15 bump 2015-08-16 22:04:25 -07:00
clowwindy b238aaf8cc bump 2.5.3 2015-08-16 18:17:53 -07:00
clowwindy 4e01a40dd8 replace polipo with privoxy 2015-08-16 18:07:05 -07:00
icylogic 34ab170e4c fix serveral minor bugs 2015-08-13 18:29:17 +08:00
icylogic c08463710e feature: get ISP 2015-08-13 04:11:34 +08:00
icylogic e15ba8dc8b Refactor code with syntactic sugars in c#. 2015-08-12 23:15:13 +08:00
icylogic 26557bfdc3 adjust interval of statistics 2015-08-11 12:17:03 +08:00
icylogic 0e4f0f17cd Add availability statistics service and a simple strategy
Strategy: Simply Choose By Statistics
2015-08-11 02:59:56 +08:00
clowwindy e1a90da2a4 will not distinguish .Net 2.0 and 4.0 2015-08-04 01:59:17 -07:00
clowwindy 6a5432c861 bump 2.5.2 2015-08-04 01:47:21 -07:00
clowwindy c66ede2f59 fix a warning 2015-07-26 12:38:08 +08:00
clowwindy 60dc9e7d71 bump 2.5.1 2015-07-26 12:32:35 +08:00
clowwindy eda92b80e1 refine logs 2015-07-26 12:27:34 +08:00
clowwindy 1a68544f7f bump 2015-07-25 19:06:03 +08:00
clowwindy dafe33f7ed fix a crash 2015-07-25 19:05:37 +08:00
clowwindy 008e3544f2 refine HA 2015-07-25 18:39:14 +08:00
clowwindy 449df1022d add connect timeout 2015-07-25 17:40:08 +08:00
clowwindy cb5fece8b3 HA almost works 2015-07-25 16:22:28 +08:00
clowwindy 8c869ca38e add retry 2015-07-25 14:16:29 +08:00
clowwindy ddd46ed8c6 add HA 2015-07-24 04:17:33 +08:00
clowwindy 4afd5faf3f add load balancing 2015-07-22 15:58:39 +08:00