Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
670 Commits 7 Branches 37 Tags
fd67708f15b408799bc79988290721f155e2e54c
Commit Graph
670 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gang Zhuo fd67708f15 Merge pull request #436 from NanaLich/master 
Master
 2016-02-06 11:36:51 +08:00
Licshee bf596a7d17 Merge branch 'working' 2016-02-06 11:14:12 +08:00
Licshee 6a33e24ebc forgot about empty lines, my bad 2016-02-06 11:13:17 +08:00
icylogic b07951132f Merge pull request #434 from NanaLich/master 
fix WPAD & FileStream handling
 2016-02-05 18:02:10 +08:00
Licshee 859474b577 misc improve 2016-02-04 17:30:04 +08:00
Licshee 413803c56f fix case-insensitive behavior 2016-02-04 17:29:25 +08:00
Licshee 1287eb0fa7 fix default string comparison 2016-02-04 17:27:45 +08:00
Licshee 6c28613c7e fix case-insensitive string comparison 2016-02-04 14:17:07 +08:00
Licshee b08e24c49f equality operators are always prefered in C# 
since the default object.Equals(object) does nothing more than object.ReferenceEquals(object)
 2016-02-04 12:51:27 +08:00
Licshee 24609bf53b never use string.Equals(string) if you don't know what you are doing 2016-02-04 12:46:41 +08:00
Licshee 2c90e0fcb1 code style 2016-02-04 12:35:57 +08:00
Licshee 88e4d2e317 . 2016-02-04 12:27:13 +08:00
Licshee 0a71dc6f00 - better FileStream handling 
- restore WPAD
 2016-02-04 12:19:03 +08:00
NanaLich 6bb554bf8d Merge pull request #1 from shadowsocks/master 
Master
 2016-01-25 14:12:38 +08:00
icylogic 6ce4e081ec Merge pull request #418 from bigtan/patch-1 
add statistics config translation
 2016-01-18 16:20:36 +08:00
Gang Zhuo d7ca8ad41d Merge pull request #422 from snovian/master 
fix crash in HA mode.
 2016-01-18 03:20:20 -05:00
Simon Dong 5a0a35a839 fix crashed when dns can't resolve server ip address. 2016-01-14 21:33:06 +08:00
Simon Dong 0b73017250 create statistics file if not exists. 2016-01-14 21:33:06 +08:00
Gang Zhuo 6976542cf2 tiny fix 2016-01-14 05:01:41 -05:00
Gang Zhuo 88101fd820 revert Daily Rolling Log File 
Bugs on daily rolling log file. Creation time not changed after roll
 2016-01-14 04:29:56 -05: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
Gang Zhuo 3c76238341 Merge pull request #415 from kimw/master 
added 2 features
 2016-01-14 02:28:17 -05:00
Bigtan d23af40fa1 add statistics config translation 
add statistics config translation
 2016-01-12 17:49:10 +08: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 bc3080701b daily rolling log file 2016-01-10 09:44:00 +08:00
kimw 937171996a name the variable better: rename LogFile => LogFilePath 2016-01-10 05:22:20 +08:00
kimw af3fe3fc92 upgraded 3rd packages: 
Fody 1.29.3 => 1.29.4
Microsoft.Bcl 1.1.8 => 1.1.10
Microsoft.Bcl.Build 1.0.14 => 1.0.21
Newtonsoft.Json 7.0.1 => 8.0.2
 2016-01-10 04:37:56 +08:00
Gang Zhuo 12ba488c7b atomic operations to increase traffic statistics 2016-01-05 21:42:57 -05:00
Gang Zhuo b918cb85ae tiny fix 2016-01-05 01:54:42 -05:00
Gang Zhuo d2833e6d9f Merge pull request #413 from kimw/master 
a lot of commits
 2016-01-05 14:49:48 +08:00
kimw 6f38bbb1d3 fixed 0 bytes will not show up, and, corrected function name 2016-01-05 04:49:17 +08:00
kimw 22accf4a90 reformated source code 2016-01-05 03:49:57 +08:00
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 04486094f7 fixed compile errors in Release mode 2016-01-05 03:26:55 +08:00
kimw 84f14d71c9 clean up avoid log message on timeout and network cut off. it's useless but confuse users. 2016-01-05 00:01:06 +08:00
kimw b813d9eebc featured middle click on tray pops up log viewer 2016-01-04 23:58:24 +08:00
kimw 9194b0325f avoid warning message while compile 2016-01-04 23:57:30 +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
Gang Zhuo e76582c602 Merge pull request #405 from wongsyrone/chacha20-ietf 
add chacha20-ietf support with updated libsscrypto
 2015-12-17 18:43:39 +08:00
Syrone Wong 131c4940c6 add chacha20-ietf support with updated libsscrypto 
ChaCha20 with an extended (96 bit) nonce and a 32-bit counter has
been implemented as crypto_stream_chacha20_ietf() from LibSodium 1.0.4

Please refer to https://tools.ietf.org/html/rfc7539 for details.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2015-12-17 18:25:13 +08:00
Gang Zhuo c539e027d7 support custom abp file 2015-12-16 23:35:53 +08:00
Gang Zhuo 3d49bc3128 delay check for updates 2015-12-16 23:19:07 +08:00
Gang Zhuo 805226024b Merge pull request #400 from SuperHentai/master 
Fix https://github.com/shadowsocks/shadowsocks-windows/issues/399
 2015-12-15 17:27:35 +08:00
Kaguya 87c5b23e21 https://github.com/shadowsocks/shadowsocks-windows/issues/399 2015-12-15 14:27:27 +08:00
icylogic 0ffee0110a Merge pull request #391 from icylogic/master 
Fix #389
 2015-12-13 23:49:53 +08:00
icylogic e900ad30d7 Merge branch 'hotfix/check_usability' 2015-12-08 22:53:51 +08:00