 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 |
|
 kimw
|
0eee5cd98f
|
add feature: save LogForm's config into json file.
|
2015-09-22 23:18:25 +08:00 |
|
|
Gang Zhuo
|
00ccb52bef
|
Add an option for checking updates
|
2015-09-21 22:42:16 -04:00 |
|
|
Gang Zhuo
|
1564e9ff81
|
support onetime auth
|
2015-09-20 15:13:11 +08:00 |
|
|
icylogic
|
107bc99282
|
move loading and filtering jobs to statistics service
|
2015-09-14 20:57:17 +08:00 |
|
|
kimw
|
0a733c61b8
|
fixed: standardize Logging usage
1. Add Logging.Info()
2. Console.WriteLine() -> Logging.Info()
3. Console.WriteLine() in exceptions -> Logging.LogUsefulException()
|
2015-09-14 14:58:46 +08:00 |
|
|
kimw
|
7a5451976c
|
fixed: remove useless exception throw out.
|
2015-09-14 12:58:15 +08:00 |
|
|
icylogic
|
e45dd8b695
|
core functions finished
|
2015-09-03 23:37:43 +08:00 |
|
|
icylogic
|
4e1b140dd9
|
Add Json.Net and separate out Statistics Configuration file
Import Json.Net since it's difficult for SimpleJson to deal with nested type.
|
2015-09-03 14:08:35 +08:00 |
|
|
kimw
|
b1f17e02a1
|
1. limit the windows' minimized size
2. store window's size & position in config file.
3. fix: scroll bar sometimes disappear while sizing the window.
|
2015-08-21 16:47:56 +08:00 |
|
|
kimw
|
79e9a23d94
|
add feature: save LogForm's config into json file.
|
2015-08-20 21:03:38 +08:00 |
|
|
icylogic
|
bf1c79304e
|
Basic user controls
|
2015-08-16 20:07:51 +08:00 |
|
|
icylogic
|
0e4f0f17cd
|
Add availability statistics service and a simple strategy
Strategy: Simply Choose By Statistics
|
2015-08-11 02:59:56 +08:00 |
|
 clowwindy
|
01c059c4e3
|
fix server index problem
|
2015-07-26 11:37:09 +08:00 |
|
|
clowwindy
|
a0e79f37bc
|
fix #235
|
2015-07-26 10:44:44 +08:00 |
|
|
clowwindy
|
ddd46ed8c6
|
add HA
|
2015-07-24 04:17:33 +08:00 |
|
|
clowwindy
|
4afd5faf3f
|
add load balancing
|
2015-07-22 15:58:39 +08:00 |
|
|
clowwindy
|
f9f49552ae
|
add port check for 8123
|
2015-07-11 18:38:45 +08:00 |
|
|
Gang Zhuo
|
e0612854d6
|
support online pac, see https://github.com/shadowsocks/shadowsocks-csharp/issues/163
|
2015-03-20 00:46:46 -04:00 |
|
|
clowwindy
|
09d57ef0c0
|
revert
|
2015-01-21 16:44:00 +08:00 |
|
 Sharuru
|
7918cb4bd2
|
Show current mode in tray menu
|
2015-01-21 16:39:12 +08:00 |
|
|
clowwindy
|
444fabaa79
|
local port now is the same for different servers
|
2015-01-18 14:44:54 +08:00 |
|
 York Xiang
|
32941478d7
|
冒号写成逗号了，我错了……
|
2015-01-16 23:19:19 +08:00 |
|
|
York Xiang
|
3aa325edec
|
解决 QRcode 地址解析中密码可能带@符号、服务器名可能带冒号的问题
关掉 https://github.com/shadowsocks/shadowsocks-csharp/issues/131
我就是爱用中文，哼~
|
2015-01-16 23:01:06 +08:00 |
|
|
clowwindy
|
e878b41519
|
implement ssurl scan
|
2015-01-12 01:55:03 +08:00 |
|
|
clowwindy
|
5d194b42bc
|
fix #89
|
2014-12-21 15:52:30 +08:00 |
|
|
clowwindy
|
bcdbcae305
|
don't serialize FriendlyName
|
2014-12-20 20:10:11 +08:00 |
|
|
clowwindy
|
c40e908d05
|
remove CheckRemark
|
2014-12-20 18:22:02 +08:00 |
|
|
clowwindy
|
e943247150
|
update texts
|
2014-12-20 18:19:43 +08:00 |
|
|
clowwindy
|
eaaacd398d
|
minor fixes
|
2014-12-20 17:26:40 +08:00 |
|
|
clowwindy
|
5ed49ac6b6
|
add global mode
|
2014-12-14 17:43:04 +08:00 |
|
|
clowwindy
|
3b5777d830
|
lint code
|
2014-11-12 21:40:31 +08:00 |
|
 kookxiang
|
c75941fe14
|
config path
|
2014-11-12 21:05:23 +08:00 |
|
|
clowwindy
|
e4ff27a1fc
|
share over LAN
|
2014-11-09 13:31:33 +08:00 |
|
 wzxjohn
|
fc53a07203
|
change function to C# style
Change the first letter of function to upper case letter to fit C# code
style
|
2014-11-09 02:18:47 +08:00 |
|
|
wzxjohn
|
b5eac341b3
|
revert
|
2014-11-09 02:10:43 +08:00 |
|
|
wzxjohn
|
ac21a0960f
|
add config lock
Add a lock on config form to avoid accidental changes
|
2014-11-09 01:50:47 +08:00 |
|
|
clowwindy
|
c26c1dddd4
|
remarks should be plural
|
2014-11-08 17:11:56 +08:00 |
|
|
Sharuru
|
197ddd3d78
|
Add remark function
|
2014-11-08 16:41:25 +08:00 |
|
|
clowwindy
|
f0b2cb49a4
|
auto focus IP textbox
|
2014-11-08 14:20:32 +08:00 |
|
|
clowwindy
|
afa46b63b7
|
implement removing server and saving
|
2014-11-08 12:33:00 +08:00 |
|
|
clowwindy
|
ac1172c3ec
|
implement adding server
|
2014-11-08 12:17:20 +08:00 |
|