717 Commits
Author SHA1 Message Date
Gang Zhuo 5d14999988 Merge pull request #458 from GangZhuo/master
bump 3.0
3.0
2016-03-02 10:47:03 +08:00
Gang Zhuo a9589dba8b bump 3.0 2016-03-01 21:24:30 -05:00
Gang Zhuo 4bdd864d2f Merge pull request #456 from wongsyrone/privoxy-3.0.24
update privoxy to 3.0.24
2016-03-02 09:49:48 +08:00
icylogic a1ae4a6062 Merge pull request #457 from icylogic/feature/statistics_ui
feature/statistics ui
2016-03-01 23:19:58 +08:00
icylogic 65e12e43c9 make hints more friendly. 2016-03-01 23:06:21 +08:00
icylogic 11066b7581 in case of broken configs 2016-03-01 22:43:38 +08:00
icylogic 8f175c481e filter out meanless data. 2016-03-01 22:25:32 +08:00
icylogic e72822aac0 turn on optimization 2016-03-01 21:33:56 +08:00
icylogic a99fef37d3 track multiple servers at the same time
Correct AvailabilityStatistics's behavior under special strategies like "LoadBalance", which may switch the server several times in a short period.
2016-03-01 21:32:43 +08:00
Syrone Wong 72046973ed update privoxy to 3.0.24
The executable was modified based on official release version, which
prevents privoxy from showing tray icon.
jmp dword ptr [<&SHELL32.Shell_NotifyIconA>]  => nop

This should close #455

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-03-01 18:35:24 +08:00
icylogic 7914d704d9 finish basic calculation 2016-03-01 14:53:57 +08:00
icylogic 7a3f946913 fix databinding 2016-03-01 11:06:09 +08:00
icylogic e0e0f646b0 fix the chart 2016-03-01 00:38:43 +08:00
icylogic 3b7cbf8020 fix weird logic for reading files. 2016-02-29 21:36:55 +08:00
icylogic 2086b5900d Merge remote-tracking branch 'upstream/master' into feature/statistics_ui
# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
#	shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs
2016-02-29 20:56:01 +08:00
Gang Zhuo ea43e2a72d use ConcurrentDictionary instead of Dictionary 2016-02-25 22:41:20 +08:00
Gang Zhuo 3c8ff1c666 Merge pull request #438 from Licshee/using-StringEx
Using StringEx
2016-02-24 04:31:53 -05:00
Licshee dbab0c1852 Merge branch 'master' into using-StringEx 2016-02-19 13:27:24 +08:00
Licshee 6f0c7af5c6 update dependencies 2016-02-19 13:23:41 +08:00
Licshee 0f075f67a2 . 2016-02-08 19:16:38 +08:00
Licshee 4ed0addb7d Merge branch 'master' into using-StringEx 2016-02-08 19:14:31 +08:00
Licshee 9de588c1ce add a new .sln file for Visual Studio 2015, since we are already using C# 6 features.
you don't think people will use Roslyn with Visual Studio 2012, do you?
2016-02-08 19:11:59 +08:00
Licshee 8c77b38a7e - avoid conflict between Caseless & Costura
- introduce a way to detect problem(s) related to Costura ASAP
2016-02-08 18:47:32 +08:00
Licshee f2f0227a4d PM> Install-CleanReferencesTarget 2016-02-08 18:19:54 +08:00
Licshee 65998d0cf5 supposed to work around a problem between Caseless & Costura 2016-02-08 18:03:17 +08:00
Licshee d176bbfc76 Merge branch 'working' into using-StringEx 2016-02-06 15:58:39 +08:00
Licshee a8ffc60d31 updated StringEx to 0.2, in favor of s.NonWhiteSpaceLines() 2016-02-06 15:03:52 +08:00
Licshee df83691e91 updated Caseless.Fody depencency 2016-02-06 14:32:26 +08:00
Licshee e8027f6c82 Merge branch 'master' into working 2016-02-06 13:42:41 +08:00
Licshee 732866c095 Merge branch 'master' into using-StringEx 2016-02-06 13:41:42 +08:00
Licshee 281dfe028a . 2016-02-06 13:40:56 +08:00
Licshee 4a45d60c40 more reliable & maintainable extension methods 2016-02-06 12:56:25 +08:00
Licshee 687f397ae3 using StringEx 2016-02-06 12:47:45 +08:00
Gang Zhuo 6a8f554c06 Merge pull request #437 from NanaLich/master
more unnecessary optimize
2016-02-06 12:25:45 +08:00
Licshee 0e2c28c9b0 . 2016-02-06 11:52:07 +08:00
Gang Zhuo fd67708f15 Merge pull request #436 from NanaLich/master
Master
2016-02-06 11:36:51 +08:00
Licshee 0c7597cdf4 moar 2016-02-06 11:36:40 +08:00
Licshee bf596a7d17 Merge branch 'working' 2016-02-06 11:14:12 +08:00
Licshee 6a33e24ebc forgot about empty lines, my bad 2016-02-06 11:13:17 +08:00
icylogic b07951132f Merge pull request #434 from NanaLich/master
fix WPAD & FileStream handling
2016-02-05 18:02:10 +08:00
icylogic 06d60f54bc redesign statistics form 2016-02-05 17:25:48 +08:00
Licshee 859474b577 misc improve 2016-02-04 17:30:04 +08:00
Licshee 413803c56f fix case-insensitive behavior 2016-02-04 17:29:25 +08:00
Licshee 1287eb0fa7 fix default string comparison 2016-02-04 17:27:45 +08:00
Licshee 6c28613c7e fix case-insensitive string comparison 2016-02-04 14:17:07 +08:00
Licshee b08e24c49f equality operators are always prefered in C#
since the default object.Equals(object) does nothing more than object.ReferenceEquals(object)
2016-02-04 12:51:27 +08:00
Licshee 24609bf53b never use string.Equals(string) if you don't know what you are doing 2016-02-04 12:46:41 +08:00
Licshee 2c90e0fcb1 code style 2016-02-04 12:35:57 +08:00
Licshee 88e4d2e317 . 2016-02-04 12:27:13 +08:00
Licshee 0a71dc6f00 - better FileStream handling
- restore WPAD
2016-02-04 12:19:03 +08:00