Commit Graph

1223 Commits

Author SHA1 Message Date
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
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
fatedier 6934a18f95
Merge pull request #981 from bighamx/patch-1
Update README_zh.md
2018-11-21 14:56:44 +08:00
SpanishBigHam 5165b0821f
Update README_zh.md
fix typo
2018-11-21 14:51:33 +08:00
fatedier 0aec869513
Merge pull request #974 from acrogenesis/patch-1
Fix setting basic auth password doc
2018-11-19 10:55:21 +08:00
Adrian Rangel 826b9db5f2
fix setting basic auth password doc 2018-11-15 22:53:35 -06:00
fatedier 89d1a1fb2b
Merge pull request #968 from fatedier/health
support health check and code refactor
2018-11-09 10:06:47 +08:00
fatedier 450e0b7148
Merge pull request #967 from fatedier/fix
update golib, fix #959
2018-11-08 09:50:35 +08:00
fatedier a1ac002694 update golib, fix #959 2018-11-07 21:10:47 +08:00
fatedier 951d33d47c
Merge pull request #966 from fatedier/new_health
refactor code
2018-11-06 23:16:56 +08:00
fatedier b33ea9274c client/control: refactor code 2018-11-06 18:35:05 +08:00
fatedier 3b3f3dc2b5
Merge pull request #947 from HaraldNordgren/master
Bump Travis versions
2018-10-29 10:16:58 +08:00
fatedier ec0b59732c
Merge pull request #955 from muesli/readme-fixes
Grammar fixes and improved README
2018-10-25 10:43:02 +08:00
Christian Muehlhaeuser bae1ecdc69
Grammar fixes and improved README
I think this reads nicer and more accurately describes the HTTP reverse proxying.
2018-10-25 00:57:50 +02:00
Harald Nordgren 5c2ab5a749 Bump Travis versions 2018-10-19 21:01:21 +02:00
fatedier 1a8ac148ca fix xtcp visitor panic 2018-10-18 13:55:51 +08:00
fatedier 698219b621 frpc: support health check 2018-09-11 18:33:02 +08:00
fatedier 229740524e
Merge pull request #891 from mark86092/bump-docker-to-1-10
Upgrade dockerfile golang to 1.10
2018-08-12 22:04:49 +08:00
Yen-chi Chen cbeeac06a5 Upgrade golang to 1.10 2018-08-12 15:03:48 +08:00
fatedier 66a69f873f
Merge pull request #890 from fatedier/dev
bump version to v0.21.0
2018-08-12 12:10:16 +08:00
fatedier fb13774457 version to v0.21.0 2018-08-12 12:04:12 +08:00
fatedier f14ed87b29
Merge pull request #886 from fatedier/websocket
Connect protocol support websocket
2018-08-10 16:36:02 +08:00
fatedier 07623027bc websocket: fix 2018-08-10 16:31:49 +08:00
fatedier 941ac25648 fix ci 2018-08-10 12:02:38 +08:00
fatedier f645082d72 vendor: add package golang.org/x/net/websocket 2018-08-10 11:49:33 +08:00
fatedier 7793f55545 websocket: update muxer for websocket 2018-08-10 11:45:48 +08:00