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

515 Commits (20fcb5843789f1b9a3dfc09d2b5efde93e3a732d)

Author SHA1 Message Date
fatedier 47db75e921 Merge pull request #152 from fatedier/maodanp/subdomain 
Maodanp/subdomain
 2016-11-09 00:14:33 +08:00
Maodanping c702355669 frps/control rename authTimeout; add judgement for subdomain 2016-11-08 13:40:40 +08:00
Maodanping 7cc5d03f35 conf/frps.ini modify domain field 2016-11-07 09:51:27 +08:00
Maodanping 54beb19435 frps/control.go remove log info 2016-11-05 14:26:04 +08:00
Maodanping 396e148f80 add subdomain configuration; add conn auth timeout 2016-11-05 14:15:16 +08:00
fatedier 4c69a4810e Merge pull request #112 from moul/patch-1 
Grammar fix
 2016-09-13 09:43:50 +08:00
Manfred Touron 40e023f5f4 Grammar fix 2016-09-12 23:15:34 +02:00
fatedier adcb2c1ea5 typo 2016-09-06 17:56:09 +08:00
fatedier 8c497793c5 Merge pull request #101 from fatedier/maodanp/http_auth 
Maodanp/http auth
 2016-09-05 22:25:01 -05:00
Maodanping 78c6845781 utils/vhost: remove fmt.Printf method 2016-08-29 11:02:59 +08:00
Maodanping dc5e130d33 utils/vhost: supprot http authentication 2016-08-29 10:53:02 +08:00
fatedier fbc504dfa3 cmd/frps: fix wrong usage of package docopt 
Fixes #98.
 2016-08-26 23:00:56 +08:00
fatedier 77f207d69a Merge branch 'master' into dev 2016-08-24 13:49:46 +08:00
fatedier b65e037b5e Fix conflicts 
Conflicts:
	README_zh.md
	src/utils/version/version.go
 2016-08-24 13:49:13 +08:00
fatedier b8a28e945c Merge pull request #94 from fatedier/doc 
doc: add donation info
 2016-08-24 13:40:55 +08:00
fatedier 0476a85a7d doc: add donation info 2016-08-24 13:36:38 +08:00
fatedier 5661537f7c cmd/frpc: fix a merge typo cause pool_count do not work 2016-08-23 15:59:50 +08:00
fatedier 19f7950485 bump version to 0.8.1 
bump version to 0.8.1
 2016-08-23 10:37:22 +08:00
fatedier c21f8ad291 utils/version: bump version to 0.8.1 2016-08-23 10:34:14 +08:00
fatedier 3d6578b15f Merge pull request #90 from fatedier/release0.8 
merge some fix
 2016-08-23 10:23:44 +08:00
fatedier 899d6837df release v0.8.1 
release v0.8.1
 2016-08-23 10:22:31 +08:00
fatedier 0e1752b5ce Merge pull request #88 from fatedier/fatedier/wildcard_domains 
utils/vhost: support wildcard domains
 2016-08-23 01:03:41 +08:00
fatedier da182ecd81 utils/vhost: support wildcard domains 2016-08-23 00:58:51 +08:00
fatedier 94c7f57949 dep: fix a log file deleted bug caused by beego.logs 2016-08-22 01:08:19 +08:00
fatedier c8e5096f48 utils/pcrypto: fix the bug of using aes 
1. The aes IV needs to be unique, but not secure.
2. The key should be 16, 24 or 32 bytes.

Fixes #85.
 2016-08-21 23:28:01 +08:00
fatedier 5079bf01fd doc: update 2016-08-21 00:52:15 +08:00
fatedier 603d7df49a build: add mips64 and mips64le 2016-08-21 00:07:25 +08:00
fatedier 2b1c39e03d cmd/frps: a bug of status display in dashboard, fix #80 2016-08-18 14:52:11 +08:00
fatedier 46ee2f2bc8 utils/conn: typo 2016-08-17 10:07:16 +08:00
fatedier 3d5c3acee0 dockerfile: add dockerfile for alpine 2016-08-16 16:10:04 +08:00
fatedier 41fd4bb673 typo 2016-08-16 15:09:32 +08:00
fatedier e1e18ba9d6 dockerfile: update 2016-08-16 15:06:48 +08:00
fatedier ab9eff97a8 doc: update contributing 2016-08-16 14:09:29 +08:00
fatedier 6f40b1a70a build: use golang 1.7 2016-08-16 14:03:19 +08:00
fatedier 87c9b8f548 Merge pull request #78 from moul/add-docker 
Initial Docker support
 2016-08-15 23:37:53 +08:00
Manfred Touron 3fcf7efc5a
Initial Docker support 2016-08-15 17:28:37 +02:00
fatedier a655f5699b utils/version: change version to 0.9.0 2016-08-15 01:11:37 +08:00
fatedier 09624b56ca Merge pull request #76 from fatedier/fatedier/support_http_proxy 
frpc: add support for connecting server through http proxies, see #67
 2016-08-15 01:07:50 +08:00
fatedier e262ac6abd frpc: add support for connecting server through http proxies, see #67 2016-08-15 00:55:22 +08:00
fatedier 47c1a3e52c Merge pull request #74 from se77en/master 
Add basic auth to dashboard
 2016-08-14 13:55:13 +08:00
Eric Larssen 4dadaac905 Add basic auth to dashboard 2016-08-14 12:45:35 +08:00
fatedier e1ed6660b0 Merge pull request #71 from ericlarssen/updateDocs 
Sentence Spacing in Readme, killed some whitespace.
 2016-08-13 23:17:38 +08:00
Eric Larssen b71b2cf46d Add sentence spacing in readme 2016-08-13 09:32:11 -05:00
fatedier a0903d4121 release v0.8.0 
release v0.8.0
 2016-08-12 14:00:54 +08:00
fatedier b403e4142b Merge pull request #65 from fatedier/0.8doc 
0.8doc
 2016-08-12 13:58:32 +08:00
fatedier 46716acd8e doc: update 2016-08-12 13:44:25 +08:00
fatedier c7f85bcdd3 doc: new features 2016-08-12 12:50:12 +08:00
fatedier ddd2acfe9f models/msg: fix current connections statistics problem 2016-08-12 10:07:02 +08:00
fatedier e3bf7e2b2b cmd/frps: typo 2016-08-12 00:57:46 +08:00
fatedier 4914472215 assets: update assets 2016-08-12 00:39:39 +08:00