Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,025 Commits 7 Branches 37 Tags
4.0
Commit Graph
100 Commits
Author SHA1 Message Date
Syrone Wong 7408a75f0e drop OTA; add AEAD config 2017-03-31 22:04:41 +08:00
noisyfox f66638d14c Don't check and throw exception in a display function. We should check this at input side. 2016-12-15 16:51:23 +11:00
noisyfox b7b92a4af9 Very rarely used regex, do not compile 2016-12-13 20:47:39 +11:00
noisyfox 22d8cdeff7 Add secret in local pac url. 2016-12-08 18:13:22 +11:00
noisyfox 65b9c9f5fa Allow check pre-release version 2016-12-06 22:01:00 +11:00
Syrone Wong 355ab0e63d Use UTF-8 encoding for optional tag in ss url (#918) 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-12-01 00:31:03 +11:00
Syrone Wong 6d01cb074e Add optional tag support for ss url (#917) 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-11-30 22:58:33 +11:00
noisyfox 206e0b8cb5 Fix a null ref 
if user manually deleted the whole 'configs' field in gui-config.json.
Which won't crash the app but will lost all other configs.
 2016-11-21 14:12:31 +11:00
noisyfox 6df3250a9f Fix crash on startup when user manually deleted servers from gui-config.json 2016-11-21 13:41:36 +11:00
Syrone Wong c25e70e888 hotkey: Refine system proxy mode switching logic 
Merge 'Switch to PAC' and 'Switch to Global'

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-11-15 18:14:56 +08:00
noisyfox 964f681d3b Fix default font error. 2016-11-15 04:37:51 +11:00
noisyfox b63bab0d1a Refine LogViewerConfig. Don't store window size in main settings file 2016-11-15 04:23:59 +11:00
Syrone Wong 04ed25e16f Add timeout support for server and forward proxy 
Also, fix typo in ProxyForm

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-10-06 21:03:45 +08:00
Noisyfox 35fc73b58b Add HTTP proxy support in forward proxy (#745) 
* Add HTTP proxy support in forward proxy

Signed-off-by: noisyfox <timemanager.rick@gmail.com>

* Typo

* Throw exception if forward proxy not supported.
 2016-09-24 23:37:24 -05:00
Syrone Wong 99bdec334c Add global hotkey support (#724) 
Design:

Use the plain string for both config and hotkey parsing
and make use of KeyConverter, ModifierKeysConverter
to make it more rubust.

Find corresponding label (to display operation result) and callback (to do the real work) based on textbox name. In this case, they should be named as `<Feature-Name><Control-Name>`.

ShowLogsTextBox,
ShowLogsLabel,
ShowLogsCallback.

If this requirement doesn't meet, throw an exception at runtime.

Logic:

How to input keys:
1. put focus in the corresponding textbox
2. press the key combination you want to use
3. when you think it is ready, release all keys
4. the textbox shows your input

How to change keys:
1. put focus in the corresponding textbox
2. press BackSpace to clear content
3. re-input new one

How to deactivate:
1. clear content in the textbox
2. press OK button

Meaning of label color:
- Green: this combination is not occupied by other programs and register successfully
- Yellow: this combination is occupied by other programs and you have to change to another one
- Transparent without color: initial status

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-09-16 23:42:16 -05:00
Syrone Wong 33b2ca8c8a Refactor 
- Only use one instance of LogForm

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-09-16 00:47:05 +08:00
Syrone Wong d3c6039c61 Refine Proxy config 
- Move to seperate model

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-09-14 23:19:39 +08:00
破娃酱 d73b77ff88 fix ss URL bug with no padding base64 (#700) 2016-09-06 14:31:22 +08:00
金黎明 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