github/trojan-go
4
0
Fork 0
mirror of https://github.com/p4gefau1t/trojan-go.git synced 2024-04-21 12:21:34 +00:00
Code Issues Releases Wiki Activity
267 Commits 8 Branches 64 Tags
1cd2a68be3f67566626341bcb2fa65f59dfc68d5
Commit Graph
267 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Page Fault 1cd2a68be3 simplify code 2020-05-11 07:48:05 +00:00
Page Fault 50db37dc94 fix bugs 2020-05-10 15:10:22 +00:00
Page FaultandGitHub 468c2831c8 Merge pull request #51 from teddysun/upgrade_v2ray 
Upgrade v2ray to v4.23.1
 2020-05-10 10:05:45 +00:00
Teddysun c8ef2b7a7e Upgrade v2ray to v4.23.1 2020-05-10 17:56:00 +09:00
p4gefau1t 8b449b859c add server tls handshaking logging 2020-05-09 14:26:27 -04:00
p4gefau1t 3cc0792f3f update docs 2020-05-08 10:41:00 -04:00
p4gefau1t 55c5bf2801 update docs 2020-05-08 10:19:10 -04:00
p4gefau1t c11027f622 update api package name 2020-05-08 09:48:13 -04:00
p4gefau1t 6fb301d4f0 fix dockerfile path 2020-05-08 08:03:54 -04:00
Page FaultandGitHub 98cf6a4126 Merge pull request #50 from bigbighill/dev 
增加时区，方便查看日志
 2020-05-08 11:05:25 +00:00
bigbighillandGitHub 076ed78742 增加时区，方便查看日志。 2020-05-08 18:38:20 +08:00
bigbighill c7d81972c3 Merge branch 'dev' of https://github.com/p4gefau1t/trojan-go into dev 
Conflicts:
	Dockerfile
 2020-05-08 18:34:33 +08:00
bigbighillandGitHub df89b6a5b7 增加时区，方便查看日志 2020-05-08 18:28:24 +08:00
Page FaultandGitHub 3005f4c60a Merge pull request #48 from colachg/dev 
Fix docker image tag
 2020-05-08 08:46:11 +00:00
colachg 3ae036d5b6 Update Dockerfile 2020-05-08 14:27:29 +08:00
colachg d30db8cf9c Try to fix image tag 2020-05-08 14:12:45 +08:00
p4gefau1t 86f0217644 try to fix the fxxking docker image test v0.4.7 2020-05-08 01:53:20 -04:00
p4gefau1t aab26865e6 try to fix docker test 2020-05-08 01:43:24 -04:00
p4gefau1t f0f208f2bc try to fix docker test 2020-05-08 01:34:26 -04:00
p4gefau1t 98ff308932 update readme 2020-05-08 01:19:56 -04:00
Page FaultandGitHub 518390cc8f Merge pull request #47 from colachg/dev 
Add trojan-go dir in etc and fix action warning
 2020-05-08 05:18:03 +00:00
colachg dc13c1292c Update build action with ignore paths 2020-05-08 12:13:48 +08:00
colachg 821d1c49a2 Add test image 2020-05-08 12:08:12 +08:00
colachg 1c84f016bc Add trojan-go dir in etc and fix action warning 2020-05-08 11:51:01 +08:00
p4gefau1t 9ec2222b32 update version number 2020-05-07 23:29:11 -04:00
Page FaultandGitHub aca99d758e Merge pull request #46 from colachg/dev 
Fix build docker action syntax error
 2020-05-08 03:20:22 +00:00
p4gefau1t f2c88398fa docker bandage, remove testing workflow 2020-05-07 23:16:21 -04:00
colachg 9aa6990b62 Fix build docker action syntax error 2020-05-08 11:06:43 +08:00
p4gefau1t 838b361a9d Merge branch 'dev' of github.com:p4gefau1t/trojan-go into dev 2020-05-07 23:00:39 -04:00
p4gefau1t a99b5e6c26 fix http proxy, update readme 2020-05-07 23:00:27 -04:00
Page FaultandGitHub 7f99d07582 Merge pull request #45 from colachg/dev 
Update Dockerfile and add docker build action
 2020-05-08 02:56:41 +00:00
colachg de667e6e20 Remove docker dir 2020-05-08 10:47:50 +08:00
colachg 5b923465c7 Update Dockerfile and add docker build action 2020-05-08 10:23:24 +08:00
p4gefau1t 85d492afcd update docker file 2020-05-07 14:57:16 -04:00
p4gefau1t 4146d49e07 fix nat, add testing workflow v0.4.6 2020-05-07 13:02:15 -04:00
p4gefau1t f4770daf1e fix http panic 2020-05-07 11:35:30 -04:00
p4gefau1t e53b344b52 fix readme bandage 2020-05-07 11:06:23 -04:00
p4gefau1t fd46d31d2c fix websocket hostname, shadowing relay timeout 2020-05-07 08:09:14 -04:00
Page FaultandGitHub 11a3e74615 Merge pull request #44 from llc1123/master 
dockerfiles
 2020-05-07 09:45:33 +00:00
粒粒橙 b28f37bc4e more tags 2020-05-07 17:19:08 +08:00
粒粒橙 0b10eaa0ec dockerfile for server-redis 2020-05-07 17:09:45 +08:00
p4gefau1t 339e6eaad5 update version number v0.4.5 2020-05-07 01:46:55 -04:00
p4gefau1t 19b90ba265 update mysql default settings 2020-05-07 01:36:15 -04:00
p4gefau1t 4bd4c42e38 code highlighting 2020-05-07 01:23:56 -04:00
p4gefau1t 9b5fc4a384 Merge branch 'dev' of github.com:p4gefau1t/trojan-go into dev 2020-05-07 01:09:33 -04:00
p4gefau1t 514f4e4e1b update geoip download url 2020-05-07 01:09:18 -04:00
Page FaultandGitHub cf2975ff0e Merge pull request #42 from llc1123/dev 
update docs
 2020-05-07 05:08:17 +00:00
粒粒橙 ff9910cbb7 Merge remote-tracking branch 'upstream/dev' into dev 2020-05-07 13:05:52 +08:00
粒粒橙 23ff8e1c8d update docs 2020-05-07 13:05:05 +08:00
p4gefau1t c9f99198f3 Merge branch 'dev' of github.com:p4gefau1t/trojan-go into dev 2020-05-07 00:47:58 -04:00