github
/
frp
mirror of https://github.com/fatedier/frp
1
0
Fork 0
Code Issues Releases Wiki Activity
690 Commits
3 Branches
108 Tags
82 MiB
Commit Graph

690 Commits (285d1eba0dfc900b41e34bd94d0e15f43cfef9cc)

Author SHA1 Message Date
fatedier da78e3f52e
Merge pull request #781 from fatedier/dev 
bump version to 0.19.1
 2018-05-19 23:10:17 +08:00
fatedier e1918f6396 frps add '-t' to set token 2018-05-18 10:58:08 +08:00
fatedier ad1e32fd2d fix panic error when vhost_http_port is not set but there is a http 
proxy, fix #776
 2018-05-18 00:21:11 +08:00
fatedier 3726f99b04 fix ci 2018-05-17 00:44:53 +08:00
fatedier c8a7405992 version to 0.19.1 2018-05-17 00:17:22 +08:00
fatedier 040d198e36
Merge pull request #773 from fatedier/nat 
return error quickly if nathole make error
 2018-05-17 00:10:53 +08:00
fatedier 1a6cbbb2d2 return error quickly if nathole make error 2018-05-17 00:07:56 +08:00
fatedier ea79e03bd0
Merge pull request #772 from fatedier/web 
update dashboard ui
 2018-05-16 23:56:12 +08:00
fatedier 3e349455a0 commands for xtcp, stcp add 'bind_port', fix #767 2018-05-16 23:45:44 +08:00
fatedier c7a457a045 update web assets 2018-05-16 03:34:43 +08:00
fatedier 0b0d5c982e update web 2018-05-16 02:51:02 +08:00
fatedier c4f873c07a update web package 2018-05-14 16:17:13 +08:00
fatedier 01b1df2b91 update cmd help info 2018-05-14 15:01:16 +08:00
fatedier f1bea49314
Merge pull request #766 from fatedier/dev 
bump version to 0.19.0
 2018-05-14 11:08:46 +08:00
fatedier 2ffae3489b dashboard: more params 2018-05-11 17:25:01 +08:00
fatedier 96b94d9164 dashbaord_api: more info 2018-05-11 17:14:16 +08:00
fatedier 76b04f52d1 udpate doc 2018-05-11 16:54:36 +08:00
fatedier 97db0d187a
Merge pull request #760 from fatedier/vendor 
move some packages to golib (https://github.com/fatedier/golib)
 2018-05-11 16:47:03 +08:00
fatedier d9aadab4cb vendor: add golib/msg 2018-05-11 16:42:08 +08:00
fatedier a0fe2fc2c2 vendor: models/msg 2018-05-11 16:37:44 +08:00
fatedier 1464836f05 logs panic debug strace info 2018-05-11 12:05:37 +08:00
fatedier b2a2037032 change accept connection error loglevel to debug 2018-05-11 10:35:16 +08:00
fatedier 071cbf4b15 vendor: update 2018-05-09 01:05:14 +08:00
fatedier 20fcb58437 vendor: add package golib/net 2018-05-09 00:23:42 +08:00
fatedier a27e3dda88 vendor: update shutdown 2018-05-08 23:51:13 +08:00
fatedier 1dd7317c06 vendor: add package io 2018-05-08 23:42:04 +08:00
fatedier 58a54bd0fb
Merge pull request #755 from king6cong/master 
typo fix
 2018-05-08 17:12:02 +08:00
king6cong caec4982cc typo fix 2018-05-08 17:02:49 +08:00
fatedier dd8f788ca4 use dep instead of glide 2018-05-08 02:40:11 +08:00
fatedier 8a6d6c534a vendor: udpate 2018-05-08 02:13:30 +08:00
fatedier 39089cf262
Merge pull request #750 from fatedier/doc 
doc: update
 2018-05-07 16:48:52 +08:00
fatedier 55800dc29f doc: update 2018-05-07 16:46:04 +08:00
fatedier 04560c1896 web: translate web interface completely to English, fix #680 2018-05-06 23:39:33 +08:00
fatedier 178efd67f1
Merge pull request #746 from fatedier/mux 
http port and https port can be same with frps bind_port
 2018-05-06 22:54:30 +08:00
fatedier 6ef5fb6391
Merge pull request #744 from wujingquan/patch-1 
Update frps_full.ini
 2018-05-06 22:53:59 +08:00
fatedier 1ae43e4d41 plugin: update http_proxy 2018-05-06 22:47:26 +08:00
fatedier 5db605ca02 frps: vhost_http_port and vhost_https_port can be same with frps bind 
port
 2018-05-06 20:25:52 +08:00
Touch e087301425
Update frps_full.ini 2018-05-06 04:08:36 +08:00
fatedier f45283dbdb disable yamux default log 2018-05-05 00:09:39 +08:00
fatedier b0959b3caa bump version to v0.19.0 2018-05-04 23:14:38 +08:00
fatedier c5c89a2519 doc: update 2018-05-04 23:12:23 +08:00
fatedier bebd1db22a
Merge pull request #740 from fatedier/socks5 
frpc: support connectiong frps by socks5 proxy
 2018-05-04 19:15:11 +08:00
fatedier cd37d22f3b vendor: udpate golang.org/x/net 2018-05-04 18:37:43 +08:00
fatedier 30af32728a frpc: support connectiong frps by socks5 proxy 2018-05-04 18:36:38 +08:00
fatedier 60ecd1d58c cmd: change http_user and http_pwd default value to empty 2018-05-03 10:20:09 +08:00
fatedier a60be8f562 update Makefile 2018-05-03 00:32:05 +08:00
fatedier c008b14d0f
Merge pull request #735 from fatedier/dev 
bump version to v0.18.0
 2018-05-02 22:37:09 +08:00
fatedier 853892f3cd change version to v0.18.0 2018-05-02 22:09:15 +08:00
fatedier e43f9f5850
Merge pull request #734 from fatedier/mux 
use yamux instead of smux
 2018-05-02 21:57:18 +08:00
fatedier d5f30ccd6b
Merge pull request #726 from shuaihanhungry/develop 
do not ignore config parsing error
 2018-05-02 21:51:02 +08:00