16 Commits
Author SHA1 Message Date
celeron533 8cd64d4022 Reuse the PAC file merge procedure 2017-12-20 21:49:05 +08:00
Liming Jin dc718a583b Put user rules at the begin of the PAC file.
Fix: #1468
Enhance: 46d40fec67
2017-12-10 17:25:07 +08:00
Syrone Wong f9ed9174cc Fix crash when reading pac user rules
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-12-23 12:16:26 +08:00
Licshee a8ffc60d31 updated StringEx to 0.2, in favor of s.NonWhiteSpaceLines() 2016-02-06 15:03:52 +08:00
Licshee 4a45d60c40 more reliable & maintainable extension methods 2016-02-06 12:56:25 +08:00
Licshee 0c7597cdf4 moar 2016-02-06 11:36:40 +08:00
Licshee 859474b577 misc improve 2016-02-04 17:30:04 +08:00
kimw 22accf4a90 reformated source code 2016-01-05 03:49:57 +08:00
kimw c2095b5ad7 migrated SimpleJson => Newtonesoft.Json, and of cause removed SimpleJson source files. 2016-01-05 03:45:26 +08:00
kimw 64390d45ac GetTempPath() now supports: return a full path with filename combined which pointed to the temporary directory 2016-01-04 23:56:43 +08:00
kimw 0b16ef7445 Merge upstream
# Conflicts:
#	README.md
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Service/PACServer.cs
#	shadowsocks-csharp/Controller/Strategy/SimplyChooseByStatisticsStrategy.cs
#	shadowsocks-csharp/Data/cn.txt
#	shadowsocks-csharp/Model/Configuration.cs
#	shadowsocks-csharp/Model/LogViewerConfig.cs
#	shadowsocks-csharp/View/LogForm.Designer.cs
#	shadowsocks-csharp/View/LogForm.cs
#	shadowsocks-csharp/View/MenuViewController.cs
2016-01-04 09:14:55 +08:00
Gang Zhuo c539e027d7 support custom abp file 2015-12-16 23:35:53 +08:00
Wensheng Tang 29afe43414 Update GFWList URL 2015-09-20 10:58:38 +08:00
kimw 0759bc894f Move: gfwlist from googelcode -> github 2015-09-11 23:29:17 +08:00
kimw b2c2d05c94 support auto check user-rule.txt's change, and update the PAC file.
Note: This is a dirty hack.
2015-08-21 22:12:14 +08:00
clowwindy 4afd5faf3f add load balancing 2015-07-22 15:58:39 +08:00