Commit Graph

811 Commits

Author SHA1 Message Date
fatedier
d9b5e0bde0
Merge pull request #1061 from fatedier/dev
bump version to v0.23.2
2019-01-26 22:11:57 +08:00
fatedier
05ca72dbf0 bump version 2019-01-26 22:05:58 +08:00
fatedier
ef6f8bbf6c
Merge pull request #1060 from fatedier/new
fix control delete error
2019-01-26 22:05:38 +08:00
fatedier
70ac7d3d11 fix control delete error 2019-01-26 21:36:24 +08:00
fatedier
385c4d3dd5 frpc/cmd: update protocol description 2019-01-26 12:52:12 +08:00
fatedier
5e1983f7ed change from dep to go mod 2019-01-26 12:39:03 +08:00
haidy
9e42305909 更新至最新代码 2019-01-17 22:10:25 +08:00
haidy
edaaafbf9c Merge branch 'frp/master'
# Conflicts:
#	client/control.go
#	cmd/frpc/sub/root.go
#	server/proxy.go
#	server/service.go
2019-01-17 21:45:16 +08:00
fatedier
516cdbddb0 support go mod 2019-01-16 20:48:47 +08:00
fatedier
3954ceb93b
Merge pull request #1049 from fatedier/dev
bump version to v0.23.1
2019-01-16 14:40:29 +08:00
fatedier
2061ef11c8 bump version to v0.23.1 2019-01-16 14:35:22 +08:00
fatedier
71cbe5decc
Merge pull request #1048 from 442hz/frpc-fixup-sub-command-status-and-reload-ini-parse-problem
frpc: fixup ini config parse problem in sub command `status` and `rel…
2019-01-16 14:34:20 +08:00
荒野無燈
a2ccb6c190 frpc: fixup ini config parse problem in sub command status and reload. 2019-01-16 13:12:25 +08:00
fatedier
5bdf530b7e
Merge pull request #1045 from fatedier/dev
merge dev -> master
2019-01-15 19:45:00 +08:00
fatedier
5177570da4
Merge pull request #1043 from 442hz/fixup-dashboard-api
frps dashboard api: fixup getProxyStatsByType no data return
2019-01-15 19:37:47 +08:00
荒野無燈
0bd8f9cd9b frps dashboard api: fixup getProxyStatsByType no data return 2019-01-15 19:22:38 +08:00
fatedier
649a2f2457
Merge pull request #1042 from fatedier/dev
release v0.23.0
2019-01-15 16:01:24 +08:00
fatedier
54916793f9
Merge pull request #1041 from fatedier/update
optimize code
2019-01-15 15:58:06 +08:00
fatedier
0b06c1c821 doc: add zsxq pic 2019-01-15 15:27:27 +08:00
fatedier
bbc6f1687d doc: add health check 2019-01-15 11:29:41 +08:00
fatedier
b250342e27 web: remove auth timeout 2019-01-15 00:32:11 +08:00
fatedier
f76deb8898 frps: remove auth timeout 2019-01-15 00:22:13 +08:00
fatedier
611d063e1f server: adjust code structure 2019-01-15 00:11:08 +08:00
fatedier
0c7d778896 frps: optimize code 2019-01-11 14:34:50 +08:00
haidy
f2512f8fce support ipv6 2019-01-04 22:21:57 +08:00
haidy
b2e15c752e for mac support 10.11 2019-01-03 21:53:58 +08:00
haidy
b47f4e675c 修改.gitignore文件 2018-12-29 21:43:18 +08:00
haidy
85ebd0cb62 add log function 2018-12-29 01:44:48 +08:00
caohaidi
6c6a4fe4e3 修改.gitignore 2018-12-28 18:49:19 +08:00
caohaidi
fb6dadf182 修改.gitignore 2018-12-28 18:48:25 +08:00
caohaidi
38c0513ada 添加mac支持库 2018-12-28 18:45:31 +08:00
caohaidi
522a665ddc 添加版本号 2018-12-28 18:44:19 +08:00
caohaidi
594ae40261 修改判断frp状态可能错误的bug 2018-12-27 13:32:20 +08:00
haidy
531d708f7b 修改日志功能 2018-12-26 22:48:10 +08:00
caohaidi
83b9e076f9 修复可能崩溃的bug 2018-12-22 18:59:09 +08:00
haidy
dda7861742 更新至最新代码 2018-12-14 08:50:55 +08:00
haidy
3c114e7cd9 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	client/control.go
#	client/service.go
2018-12-13 22:44:09 +08:00
fatedier
7c21906884 improve kcp shutdown 2018-12-11 15:17:36 +08:00
fatedier
a4106ec4b7
Merge pull request #1006 from fatedier/doc
doc: add conf template
2018-12-11 12:05:23 +08:00
fatedier
655c52f9ce doc: add conf template 2018-12-11 12:01:36 +08:00
fatedier
25cfda5768 conf: support render configure file using environment variables 2018-12-11 11:46:12 +08:00
fatedier
b61cb14c8f remove docker support 2018-12-10 14:21:33 +08:00
fatedier
d5ce4d4916
Merge pull request #1000 from fatedier/dev
bump version to v0.22.0
2018-12-09 22:35:26 +08:00
fatedier
4f0ee5980d
Merge pull request #998 from fatedier/health
frpc: support health check
2018-12-09 22:10:13 +08:00
fatedier
146956ac6e bump version to v0.22.0 2018-12-09 22:06:56 +08:00
fatedier
35278ad17f mv folders 2018-12-09 22:06:22 +08:00
fatedier
aea9f9fbcc health: add more ci cases and fix bugs 2018-12-09 21:56:46 +08:00
fatedier
08c17c3247 frpc: support health check 2018-12-07 18:40:17 +08:00
Haidy
48c2d9287e
Delete cmd 2018-11-27 21:08:06 +08:00
caohaidi
f930b62d9c 更新关闭服务接口 2018-11-27 14:53:32 +08:00