Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
820 Commits 7 Branches 37 Tags
e6e9fc85883d3ab7734a2412dbc052d97d3852e7
Commit Graph
82 Commits
Author SHA1 Message Date
金黎明 6116388262 日志窗口支持记录最大化显示状态 2016-08-13 09:52:45 +08:00
Syrone Wong 50de65624c Refine user-friendly server name 
Forgot to consider domain name.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-10 13:49:17 +08:00
Syrone Wong 4fcddc3e82 Check server IP address validity and log it 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-09 08:32:16 +08:00
Syrone Wong dc591413ce Merge branch 'dev_proxy' of https://github.com/Noisyfox/shadowsocks-windows into Noisyfox-dev_proxy 2016-08-09 07:45:15 +08:00
Noisyfox He 6a3e06cdb3 Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-windows.git into dev_proxy 
# Conflicts:
#	shadowsocks-csharp/Controller/Service/TCPRelay.cs
#	shadowsocks-csharp/Controller/ShadowsocksController.cs
#	shadowsocks-csharp/View/MenuViewController.cs
 2016-08-08 21:21:53 +10:00
Syrone Wong 3b5d38658f Minor bugfixes (#647) 
* Drop unused variable to suppress warning in LogForm

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>

* Fix IPv6 displaying

It is a little ugly, send a PR if you can find a better way.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-08 18:49:24 +08:00
Syrone Wong fb3fcdb90d Add verbose logging to log every connection 
Note:
- Added a configuration entry, user should add this
  by hand or reset from scratch.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-08 10:33:17 +08:00
noisyfox 2307c9515e add proxy settings 2016-06-29 18:21:11 +08:00
Gang Zhuo d310377c49 Merge pull request #551 from kimw/disable_statistics 
Disable StatisticsStrategy by default.
 2016-06-15 16:45:32 +08:00
kimw 5b1cf36a67 Disable StatisticsStrategy by default. 2016-05-01 18:35:39 -04:00
Mygod 9c7b100f2b Support one-time authentication in ss urls for sharing 
This commit implements the new ss protocol proposed here:
https://github.com/shadowsocks/shadowsocks-org/issues/16

Also removes a TODO in Server.cs. You are welcome.
 2016-04-15 23:12:39 +08:00
icylogic 8f175c481e filter out meanless data. 2016-03-01 22:25:32 +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
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 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 bec1f808b3 add an option for Ping tests (disabled by default) and improve the readability of the code 2016-01-20 23:51:51 +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
kimw 9194b0325f avoid warning message while compile 2016-01-04 23:57:30 +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 8a6249c4a3 revert Newtonsoft.Json 2015-10-10 03:34:27 -04:00
Gang Zhuo 8bc9a7911b remove reference of Newtonsoft.Json 2015-10-08 05:57:14 -04:00
Gang Zhuo 29d70acfb5 replace 'one_time_auth' to 'auth' 2015-10-07 23:43:41 -04:00
icylogic 4684af053e Merge branch 'master' into feature/statistics_ui 2015-09-30 21:16:45 +08:00
Gang Zhuo f7c9f2049c default font name 2015-09-22 22:30:05 -04:00
Gang Zhuo a070c3c986 small fix 2015-09-22 23:52:12 +08:00
kimw 0eee5cd98f add feature: save LogForm's config into json file. 2015-09-22 23:18:25 +08:00
Gang Zhuo 00ccb52bef Add an option for checking updates 2015-09-21 22:42:16 -04:00
Gang Zhuo 1564e9ff81 support onetime auth 2015-09-20 15:13:11 +08:00
icylogic 107bc99282 move loading and filtering jobs to statistics service 2015-09-14 20:57:17 +08:00
kimw 0a733c61b8 fixed: standardize Logging usage 
1. Add Logging.Info()
2. Console.WriteLine() -> Logging.Info()
3. Console.WriteLine() in exceptions -> Logging.LogUsefulException()
 2015-09-14 14:58:46 +08:00
kimw 7a5451976c fixed: remove useless exception throw out. 2015-09-14 12:58:15 +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
kimw b1f17e02a1 1. limit the windows' minimized size 
2. store window's size & position in config file.
3. fix: scroll bar sometimes disappear while sizing the window.
 2015-08-21 16:47:56 +08:00
kimw 79e9a23d94 add feature: save LogForm's config into json file. 2015-08-20 21:03:38 +08:00
icylogic bf1c79304e Basic user controls 2015-08-16 20:07:51 +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
clowwindy 01c059c4e3 fix server index problem 2015-07-26 11:37:09 +08:00
clowwindy a0e79f37bc fix #235 2015-07-26 10:44:44 +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 f9f49552ae add port check for 8123 2015-07-11 18:38:45 +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