Commit Graph
604 Commits
Author SHA1 Message Date
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
icylogic 1196696ed7 fix #389: crash on empty statistic data. 2015-12-08 22:53:29 +08:00
Gang Zhuo 961ca041b2 Fix bug 2015-11-25 21:26:45 -05:00
Gang Zhuo dd0d047402 override MD5, so compatible with FIPS 2015-11-23 23:52:54 +08:00
Gang Zhuo 1097d4fc5b remove space by trim() 2015-11-20 22:49:42 +08:00
Gang Zhuo 6838c9d605 Merge pull request #376 from 10people/master
Fix error in open log file in debug mode.
2015-11-19 20:15:24 +08:00
10people d0e16dc658 Add debug log in network transfer. 2015-11-16 14:59:10 +08:00
10people ca44b52593 Fix error in open log file in debug mode. 2015-11-16 14:48:26 +08:00
Gang Zhuo 8067a5bcec Merge pull request #372 from ayanamist/ayanamist-patch-1
Update privoxy_conf.txt
2015-11-12 18:50:00 +08:00
ayanamist ad75e4fd9c Update privoxy_conf.txt
use __POLIPO_BIND_PORT__ to avoid potential port conflict
2015-11-12 13:46:10 +08:00
Gang Zhuo d24548a04f rm rc4 and table 2015-10-16 04:36:31 -04:00
icylogic 82b661e6a5 Merge pull request #345 from everyx/fix-ArgumentOutOfRangeException
fix ArgumentOutOfRangeException
2015-10-11 11:56:35 +08:00
everyx 1e9f1f3764 fix ArgumentOutOfRangeException 2015-10-11 00:21:25 +08:00
Gang Zhuo 8a6249c4a3 revert Newtonsoft.Json 2015-10-10 03:34:27 -04:00
Gang Zhuo c532cce99d small fix 2015-10-08 06:40:33 -04:00
Gang Zhuo 092d1168ff start all instances on boot under portable model 2015-10-08 06:33:02 -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 ad8a8c24e6 Merge pull request #340 from icylogic/feature/statistics_ui
Feature/statistics ui
2015-10-01 00:21:44 +08:00
icylogic 6550c04650 escape comma for csv;
prevent a bug
2015-10-01 00:16:53 +08:00
icylogic 426623c9f2 always notify user that a choice is made 2015-10-01 00:02:38 +08:00
icylogic dcc751773c tiny fix 2015-09-30 23:59:03 +08:00
icylogic b9632f8636 basic statistics form UI 2015-09-30 23:54:36 +08:00
icylogic 4684af053e Merge branch 'master' into feature/statistics_ui 2015-09-30 21:16:45 +08:00
Gang Zhuo 5c570fbb56 disable one-time auth when method is table or rc4 2015-09-25 21:18:15 +08:00
Gang Zhuo 098640e792 refact 2015-09-25 04:42:56 -04:00
Gang Zhuo c5e27486fb Protocol V2 2015-09-25 04:03:04 -04:00
Gang Zhuo d0518e5a11 typo 2015-09-24 00:34:48 -04:00
Gang Zhuo 3aac1cfcfc Refine the authentication for true CCA 2015-09-23 02:08:41 -04:00
Gang Zhuo f7c9f2049c default font name 2015-09-22 22:30:05 -04:00
kimw 969ee15ad6 convert "\r\n" -> Environment.NewLine 2015-09-23 00:32:28 +08:00
Gang Zhuo 83276f4750 Merge pull request #329 from GangZhuo/master
improved log viewer
2015-09-23 00:22:21 +08: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
kimw f1019b4aad fix variables' name: (first letter uppercase -> lowercase)
1. WrapTextTrigger -> wrapTextTrigger
2. WrapTextTriggerLock -> wrapTextTriggerLock
3. TopMostTrigger -> topMostTrigger
4. TopMostTriggerLock -> topMostTriggerLock
5. ShowToolbarTrigger -> toolbarTrigger
2015-09-22 23:15:20 +08:00
kimw b632d4a8a9 improved log viewer:
1. add menu items for `clear logs`, `change fonts`, `wrap text` and `top most` functions.
2. hide toolbar default. but you can trigger it out by menu.
2015-09-22 23:15:20 +08:00
Gang Zhuo 0f793a43a0 Merge pull request #328 from GangZhuo/master
Restart twice, when click Ok button on Edit Servers window
2015-09-22 21:13:35 +08:00
Gang Zhuo b197af124b fix bug: shadowsocks restart twice, when click Ok button on Edit Servers window 2015-09-22 06:36:15 -04:00
Gang Zhuo 2ec1340261 fix "Only TrueType fonts are supported. This is not a TrueType font." 2015-09-22 02:01:23 -04:00
Gang Zhuo 41c0c803cd Merge pull request #326 from GangZhuo/issues-301
- Add an option for checking updates
- download updates automatically
2015-09-22 12:13:41 +08:00
Gang Zhuo 1d1c325ce1 fix UnitTest 2015-09-22 00:11:12 -04:00
Gang Zhuo ab79dbce0e Download updates automatically 2015-09-21 23:41:28 -04:00
Gang Zhuo 00ccb52bef Add an option for checking updates 2015-09-21 22:42:16 -04:00
Gang Zhuo 204d6b856e verbiage 2015-09-21 05:28:18 -04:00
Gang Zhuo 19085a3cd1 Update the hash function
follow with https://github.com/shadowsocks/shadowsocks-libev/commit/5ae4df94e440c4f6826a679a62687ad27303d89b
2015-09-20 23:25:37 -04:00
icylogic efdc347d68 Merge branch 'master' into feature/statistics_ui 2015-09-20 16:55:30 +08:00
Gang Zhuo ab1f366049 Combine libsscrypto.dll and libsslcrypto2.dll 2015-09-20 15:13:13 +08:00
Gang Zhuo ff0bc37694 fix UnitTest 2015-09-20 15:13:12 +08:00
Gang Zhuo eae3943556 reserve buffer for one-time auth 2015-09-20 15:13:12 +08:00