23 Commits
Author SHA1 Message Date
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
Licshee 687f397ae3 using StringEx 2016-02-06 12:47:45 +08:00
icylogic ce67551d31 migrate to record data model 2016-01-19 01:46:21 +08:00
Gang Zhuo fcec167c72 revert save bandwidth
Some bugs on Save Bandwidth. Maybe commit again after all is ok.
2016-01-14 03:45:57 -05:00
kimw 1ee07d196a save bandwidth in config file per shadowsocks server 2016-01-10 10:23:58 +08:00
kimw f9bd1c9150 featured: save bandwidth in config.json file 2016-01-10 09:45:25 +08:00
kimw c2095b5ad7 migrated SimpleJson => Newtonesoft.Json, and of cause removed SimpleJson source files. 2016-01-05 03:45:26 +08:00
Gang Zhuo 29d70acfb5 replace 'one_time_auth' to 'auth' 2015-10-07 23:43:41 -04:00
Gang Zhuo 1564e9ff81 support onetime auth 2015-09-20 15:13:11 +08:00
clowwindy ddd46ed8c6 add HA 2015-07-24 04:17:33 +08:00
clowwindy 444fabaa79 local port now is the same for different servers 2015-01-18 14:44:54 +08:00
York Xiang 32941478d7 冒号写成逗号了,我错了…… 2015-01-16 23:19:19 +08:00
York Xiang 3aa325edec 解决 QRcode 地址解析中密码可能带@符号、服务器名可能带冒号的问题
关掉 https://github.com/shadowsocks/shadowsocks-csharp/issues/131
我就是爱用中文,哼~
2015-01-16 23:01:06 +08:00
clowwindy e878b41519 implement ssurl scan 2015-01-12 01:55:03 +08:00
clowwindy 5d194b42bc fix #89 2014-12-21 15:52:30 +08:00
clowwindy bcdbcae305 don't serialize FriendlyName 2014-12-20 20:10:11 +08:00
clowwindy e943247150 update texts 2014-12-20 18:19:43 +08:00
clowwindy eaaacd398d minor fixes 2014-12-20 17:26:40 +08:00
clowwindy c26c1dddd4 remarks should be plural 2014-11-08 17:11:56 +08:00
Sharuru 197ddd3d78 Add remark function 2014-11-08 16:41:25 +08:00
clowwindy 04a4427cff update namespace 2014-11-08 01:02:50 +08:00
clowwindy 28b582590a update namespace 2014-11-08 01:01:30 +08:00
clowwindy 0eb0e8c9e6 use gui-config.json from shadowsocks-gui 2014-11-07 23:53:37 +08:00