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
|
9 years ago |
Licshee
|
859474b577
|
misc improve
|
9 years ago |
icylogic
|
bec1f808b3
|
add an option for Ping tests (disabled by default) and improve the readability of the code
|
9 years ago |
icylogic
|
586caab7c4
|
follow CA1001: Types that own disposable fields should be disposable
https://msdn.microsoft.com/library/ms182172.aspx
|
9 years ago |
icylogic
|
ce67551d31
|
migrate to record data model
|
9 years ago |
kimw
|
c2095b5ad7
|
migrated SimpleJson => Newtonesoft.Json, and of cause removed SimpleJson source files.
|
9 years ago |
Gang Zhuo
|
8a6249c4a3
|
revert Newtonsoft.Json
|
9 years ago |
Gang Zhuo
|
8bc9a7911b
|
remove reference of Newtonsoft.Json
|
9 years ago |
icylogic
|
426623c9f2
|
always notify user that a choice is made
|
9 years ago |
icylogic
|
eb6ae48bc1
|
refactor
|
9 years ago |
icylogic
|
107bc99282
|
move loading and filtering jobs to statistics service
|
9 years ago |
icylogic
|
e45dd8b695
|
core functions finished
|
9 years ago |
icylogic
|
4e1b140dd9
|
Add Json.Net and separate out Statistics Configuration file
Import Json.Net since it's difficult for SimpleJson to deal with nested type.
|
9 years ago |
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
|
9 years ago |
icylogic
|
bf1c79304e
|
Basic user controls
|
9 years ago |