Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
637 Commits 7 Branches 37 Tags
d2bb2c4a7db40f183f84ffd99c534fc62c7a005d
Commit Graph
72 Commits
Author SHA1 Message Date
kimw d2bb2c4a7d fixed don't update abp rules while event user-rule file changed. in fact, the PAC will overwrite with gfwlist & use-rule but abp. 2016-01-05 03:48:55 +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 2cce646700 featured show bandwidth in log form's title 2016-01-04 23:21:53 +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
icylogic 4684af053e Merge branch 'master' into feature/statistics_ui 2015-09-30 21:16:45 +08:00
Gang Zhuo a070c3c986 small fix 2015-09-22 23:52:12 +08:00
Gang Zhuo b197af124b fix bug: shadowsocks restart twice, when click Ok button on Edit Servers window 2015-09-22 06:36:15 -04:00
Gang Zhuo 00ccb52bef Add an option for checking updates 2015-09-21 22:42:16 -04:00
icylogic 107bc99282 move loading and filtering jobs to statistics service 2015-09-14 20:57:17 +08:00
icylogic e45dd8b695 core functions finished 2015-09-03 23:37:43 +08:00
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.
 2015-09-03 14:08:35 +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
kimw 3283c93857 fix: auto detected user-rule.txt's change while no gfwlist.txt file, the application crashs. 2015-08-22 12:26:26 +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
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 71bd0d2b5a improve user experience for some users 2015-08-18 04:26:11 -07:00
icylogic 6375a3d4a8 Merge branch 'master' into feature/statistics_ui 2015-08-17 10:42:36 +08:00
icylogic bf1c79304e Basic user controls 2015-08-16 20:07:51 +08:00
clowwindy 766b9aac56 revert gc 2015-08-16 15:46:57 -07:00
icylogic 34ab170e4c fix serveral minor bugs 2015-08-13 18:29:17 +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
Jeffrey Zhang 5ed40c7565 Added list of servers in QRCode generate window to select. 
To add multiple servers in android phone, now it is no need to chose server one by one and generate QRCode for each. Just need to select the server listed in right.
 2015-08-07 00:53:07 +08:00
clowwindy 01c059c4e3 fix server index problem 2015-07-26 11:37:09 +08:00
clowwindy dafe33f7ed fix a crash 2015-07-25 19:05:37 +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
clowwindy 680d465393 add UDPRelay 2015-07-11 18:07:49 +08:00
Gang Zhuo e0612854d6 support online pac, see https://github.com/shadowsocks/shadowsocks-csharp/issues/163 2015-03-20 00:46:46 -04:00
clowwindy eb2e5cc242 add GUI for user rule support 2015-03-06 23:02:07 +08:00
clowwindy 5eaa1b9e2b encourage users to report to gfwlist 2015-01-25 00:51:12 +08:00
clowwindy d3365a8fa4 remove unecessary code 2015-01-21 16:48:57 +08:00
Sharuru 7918cb4bd2 Show current mode in tray menu 2015-01-21 16:39:12 +08:00
clowwindy 1a0f4807c2 use polipo port in port forwarder 2015-01-18 17:56:43 +08:00
clowwindy 5463b2859a no hard code 8123 2015-01-18 17:30:42 +08:00
clowwindy 8c8c947356 use local port in gfwlist updater 2015-01-18 17:16:01 +08:00
clowwindy 5aa2822904 use local port in pac 2015-01-18 17:12:59 +08:00
clowwindy 18e6daf47d update system proxy 2015-01-18 17:01:37 +08:00
clowwindy 788d74cefd add port forwarder 2015-01-18 16:44:09 +08:00
clowwindy e81b87e7df move pac server to listener 2015-01-18 16:26:12 +08:00
clowwindy aa6c38ece3 move local to listener service 2015-01-18 15:53:45 +08:00
clowwindy 444fabaa79 local port now is the same for different servers 2015-01-18 14:44:54 +08:00
clowwindy e878b41519 implement ssurl scan 2015-01-12 01:55:03 +08:00
clowwindy a0a5cafe3d lint code 2015-01-08 21:57:51 +08:00
clowwindy 6192e09970 revert stop call 2015-01-08 21:16:45 +08:00
Gang Zhuo 4860d5b32a fire error event when the pac server is not run 2015-01-08 01:38:31 -05:00
Gang Zhuo c24c1d44b7 add new menu to update pac file via gfwlist 2015-01-07 23:41:45 -05:00
Gang Zhuo a984e90727 Stop the PACServer when controller stop 2015-01-07 23:10:12 +08:00
clowwindy a2cc753d5a update translation 2014-12-20 18:29:53 +08:00
clowwindy 52ca609e3e i18n 2014-12-20 16:56:25 +08:00