Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
750 Commits 7 Branches 37 Tags
6a8a09983e22e5e8fb529a8f32af969e7f7f2e7d
Commit Graph
750 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Syrone Wong 6a8a09983e Merge fixes from @GangZhuo, close #478 (#638) 
Squashed commit of the following:

commit e280c2385c
Merge: 579039f 87aa9eb
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Wed Mar 16 04:02:27 2016 -0400

    Merge remote-tracking branch 'origin/master'

commit 579039fe40
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 21:45:23 2016 +0800

    log unhandle exception

commit 8d863f1d5f
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 21:44:54 2016 +0800

    fix Availability Statistics

commit b3ce1c698a
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 21:07:54 2016 +0800

    tiny refactor

commit 0f7d39e27e
Merge: bd7078a b01aced
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 20:02:58 2016 +0800

    Merge remote-tracking branch 'origin/master'

commit bd7078aa4f
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 20:01:58 2016 +0800

    tiny refactor

commit 49adb95b6e
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 03:44:26 2016 -0500

    log more Ping information for debug

commit 2aa0620ddd
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 03:04:10 2016 -0500

    reduce 3rd packages

[solve conflicts and squash to make history clean]
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-05 11:05:16 +08:00
Allen Zhu b0f71c43f5 Add traffic chart and traffic icon support (#595) 
* Implement the line chart on Log View window for inbound/outbound traffic per second

* Implement dynamic tray icon to indicate Inbound and Outbound

* Refine linechart

* Bugfix for dynamic icon

* Refine chart presentation

* Change the data points' type for more accurate calculation

* Tweak inbound/outbound indicator image for tray icon
 2016-08-04 17:32:56 +08:00
Gang Zhuo 31f6864e20 Merge pull request #580 from wongsyrone/master 
Simplify MD5 handling
 2016-06-15 18:41:32 +08:00
Gang Zhuo 977ae5c513 Merge pull request #593 from chenshaoju/patch-1 
Update cn.txt
 2016-06-15 17:31:05 +08:00
Gang Zhuo 0b0edb31d1 Merge pull request #592 from Arthur2e5/patch-1 
"Server IP" -> "Server Addr"
 2016-06-15 17:30:44 +08:00
Chen Shaoju e217143c27 Update cn.txt (2) 
Fix.
 2016-06-15 17:16:15 +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
Gang Zhuo 39bdb34892 Merge pull request #565 from kimw/fix_password_mask 
fixed password mask
 2016-06-15 16:44:02 +08:00
Chen Shaoju 7275eee88d Update cn.txt 
Use new string in https://github.com/shadowsocks/shadowsocks-windows/pull/592
 2016-06-15 16:24:34 +08:00
Mingye Wang 5916592234 "Server IP" -> "Server Addr" 2016-06-15 15:34:35 +08:00
Syrone Wong 89a9b49e35 Simplify MD5 handling 
- use mbedtls_md5() instead
- update libsscrypto

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-05-28 00:12:02 +08:00
kimw ba7bfc4a82 fixed code indent 2016-05-14 10:40:20 -04:00
kimw 3f8d5b415b fixed password mask 2016-05-14 05:24:25 -04:00
Gang Zhuo f9499e7945 Merge pull request #538 from Mygod/master 
Support one-time authentication in ss urls for sharing
 2016-05-03 10:36:09 +08:00
kimw 13e125d364 bump up version 2016-05-01 18:39:35 -04: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
Gang Zhuo 87aa9ebea0 Merge pull request #496 from everyx/feature#490 
Feature #490 We can get proxy state according to tray icon color
 2016-03-16 15:58:46 +08:00
everyx c1fd3f3035 take @laincat's advice 2016-03-15 21:06:44 +08:00
everyx 22d081f72e improve tray icon color 2016-03-14 22:04:16 +08:00
everyx 45aaaa6ed9 update function name 2016-03-13 23:54:56 +08:00
everyx 1d5854dfa7 feature #490 2016-03-13 23:50:19 +08:00
Gang Zhuo b01aced174 Merge pull request #473 from GangZhuo/master 
Minor fixes
 2016-03-04 16:09:48 +08:00
Gang Zhuo 3da00178de better way to kill privoxy 2016-03-03 21:49:40 -05:00
Gang Zhuo 4325b7f6f9 fix https://github.com/shadowsocks/shadowsocks-windows/issues/466 2016-03-02 21:00:57 -05:00
Gang Zhuo 40d208e3c2 Merge pull request #464 from GangZhuo/master 
not check update when no configuration
 2016-03-03 00:54:53 +08:00
Gang Zhuo 5aff8c3c48 update project file 2016-03-02 22:18:20 +08:00
Gang Zhuo 93b9e1b158 remove debug code 2016-03-02 22:07:19 +08:00
Gang Zhuo eaad4836b5 fix issue#461 2016-03-02 22:04:08 +08:00
Gang Zhuo 87ff1c158d fix first run check update 2016-03-02 20:37:10 +08:00
Gang Zhuo 0b59fcb8c9 Merge pull request #460 from GangZhuo/master 
Conditional compile
 2016-03-02 16:27:04 +08:00
Gang Zhuo a486514afb Conditional compile 2016-03-02 02:56:41 -05:00
Gang Zhuo 079e9e248d Update CHANGES 2016-03-01 23:16:36 -05:00
Gang Zhuo 5d14999988 Merge pull request #458 from GangZhuo/master 
bump 3.0
3.0 		2016-03-02 10:47:03 +08:00
Gang Zhuo a9589dba8b bump 3.0 2016-03-01 21:24:30 -05:00
Gang Zhuo 4bdd864d2f Merge pull request #456 from wongsyrone/privoxy-3.0.24 
update privoxy to 3.0.24
 2016-03-02 09:49:48 +08:00
icylogic a1ae4a6062 Merge pull request #457 from icylogic/feature/statistics_ui 
feature/statistics ui
 2016-03-01 23:19:58 +08:00
icylogic 65e12e43c9 make hints more friendly. 2016-03-01 23:06:21 +08:00
icylogic 11066b7581 in case of broken configs 2016-03-01 22:43:38 +08:00
icylogic 8f175c481e filter out meanless data. 2016-03-01 22:25:32 +08:00
icylogic e72822aac0 turn on optimization 2016-03-01 21:33:56 +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
Syrone Wong 72046973ed update privoxy to 3.0.24 
The executable was modified based on official release version, which
prevents privoxy from showing tray icon.
jmp dword ptr [<&SHELL32.Shell_NotifyIconA>]  => nop

This should close #455

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-03-01 18:35:24 +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 3b7cbf8020 fix weird logic for reading files. 2016-02-29 21:36:55 +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
Gang Zhuo ea43e2a72d use ConcurrentDictionary instead of Dictionary 2016-02-25 22:41:20 +08:00
Gang Zhuo 3c8ff1c666 Merge pull request #438 from Licshee/using-StringEx 
Using StringEx
 2016-02-24 04:31:53 -05:00