Commit Graph
690 Commits
Author SHA1 Message Date
Gang Zhuo 3c8ff1c666 Merge pull request #438 from Licshee/using-StringEx
Using StringEx
2016-02-24 04:31:53 -05:00
Licshee dbab0c1852 Merge branch 'master' into using-StringEx 2016-02-19 13:27:24 +08:00
Licshee 6f0c7af5c6 update dependencies 2016-02-19 13:23:41 +08:00
Licshee 0f075f67a2 . 2016-02-08 19:16:38 +08:00
Licshee 4ed0addb7d Merge branch 'master' into using-StringEx 2016-02-08 19:14:31 +08:00
Licshee 9de588c1ce add a new .sln file for Visual Studio 2015, since we are already using C# 6 features.
you don't think people will use Roslyn with Visual Studio 2012, do you?
2016-02-08 19:11:59 +08:00
Licshee 8c77b38a7e - avoid conflict between Caseless & Costura
- introduce a way to detect problem(s) related to Costura ASAP
2016-02-08 18:47:32 +08:00
Licshee f2f0227a4d PM> Install-CleanReferencesTarget 2016-02-08 18:19:54 +08:00
Licshee 65998d0cf5 supposed to work around a problem between Caseless & Costura 2016-02-08 18:03:17 +08:00
Licshee d176bbfc76 Merge branch 'working' into using-StringEx 2016-02-06 15:58:39 +08:00
Licshee a8ffc60d31 updated StringEx to 0.2, in favor of s.NonWhiteSpaceLines() 2016-02-06 15:03:52 +08:00
Licshee df83691e91 updated Caseless.Fody depencency 2016-02-06 14:32:26 +08:00
Licshee e8027f6c82 Merge branch 'master' into working 2016-02-06 13:42:41 +08:00
Licshee 732866c095 Merge branch 'master' into using-StringEx 2016-02-06 13:41:42 +08:00
Licshee 281dfe028a . 2016-02-06 13:40:56 +08:00
Licshee 4a45d60c40 more reliable & maintainable extension methods 2016-02-06 12:56:25 +08:00
Licshee 687f397ae3 using StringEx 2016-02-06 12:47:45 +08:00
Gang Zhuo 6a8f554c06 Merge pull request #437 from NanaLich/master
more unnecessary optimize
2016-02-06 12:25:45 +08:00
Licshee 0e2c28c9b0 . 2016-02-06 11:52:07 +08:00
Gang Zhuo fd67708f15 Merge pull request #436 from NanaLich/master
Master
2016-02-06 11:36:51 +08:00
Licshee 0c7597cdf4 moar 2016-02-06 11:36:40 +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