217 Commits

Author SHA1 Message Date
kslr
08d3f2b4b2 format example json 2020-07-31 19:23:33 +08:00
kslr
7ad88b8f38 add editconfig and use 4 space 2020-07-31 19:14:59 +08:00
kslr
e9a1bba610 Merge branch 'master' of github.com:v2fly/vTemplate 2020-07-31 18:53:39 +08:00
kslr
99018361ed adjust name 2020-07-31 18:53:15 +08:00
Kslr
224528caa6
Update README.md
syntax highlighting json
2020-07-31 18:42:52 +08:00
kslr
b265293db5 update readme 2020-07-31 18:37:13 +08:00
EpLiar
415197126b
Merge pull request #2 from gakkurorto/new-pic
Use Mermaid to generate flowchart image.
2020-07-31 17:23:40 +08:00
hatrasikno
e00b25a952 Use Mermaid to generate flowchart image. 2020-07-31 17:18:42 +08:00
EpLiar
31b3f339f6
Update TCP/config_server.json 2020-07-31 16:06:21 +08:00
EpLiar
0e4ea9159c
Update TCP/config_client.json 2020-07-31 16:05:31 +08:00
EpLiar
e6965e14a2
Refine README.md 2020-07-31 16:00:08 +08:00
EpLiar
a2cda353ef
Remove useless 'tcpSettings' 2020-07-31 11:38:16 +08:00
EpLiar
186c756939
Remove duplicated tag 2020-07-31 09:15:05 +08:00
EpLiar
2a7c51e91c
Create 'mkcp 动态端口/config_server.json' 2020-07-31 09:13:02 +08:00
EpLiar
5f03237434
Create 'mkcp 动态端口/config_client.json' 2020-07-31 09:04:13 +08:00
EpLiar
8f352b8564
Update TCP/config_server.json 2020-07-30 22:52:09 +08:00
EpLiar
fe8c0250f5
Update TCP/config_client.json 2020-07-30 22:51:21 +08:00
Kiri
99a1af9d27
Merge pull request #16 from q158073378252010/2018.11.06
update nginx config add v2ray_v4.x config
2018-11-20 16:47:39 +08:00
root
0a911bdb93 update ngnx config,add server/client config 2018-11-06 20:50:24 +08:00
q158073378252010
8565c75141
Merge pull request #5 from KiriKira/master
sync 2018.11.06
2018-11-06 20:35:16 +08:00
kirikira
14496a36f0 Merge branch 'master' of https://github.com/KiriKira/vTemplate 2018-10-14 17:05:32 +08:00
kirikira
d08d421f0e add MITM 2018-10-14 17:05:28 +08:00
Kiri
4880bc3071
Merge pull request #12 from q158073378252010/patch-1
ws+nginx+tls update config
2018-04-19 17:33:53 +08:00
q158073378252010
3034efd24c
Update config_server.json 2018-04-18 15:55:36 +08:00
q158073378252010
cc0ab32f8c
Update config_client.json 2018-04-18 15:51:01 +08:00
q158073378252010
e7305b78dd
Update config_server.json 2018-04-18 15:33:01 +08:00
kirikira
bd3b4ee030 add caddy+h2 config 2018-04-16 17:47:18 +08:00
kirikira
d1f24d4a9f add http/2 config 2018-04-16 17:07:21 +08:00
Kiri
bbff5e06b6
Merge pull request #10 from zw0/patch-1
socks5-tls config_server.json
2018-03-30 22:09:05 -07:00
zw0
f6d25c0453
Create config_client.json 2018-03-29 23:44:50 +08:00
zw0
e4e5a3c88a
socks5-tls config_server.json 2018-03-29 13:48:40 +08:00
Kiri
8550e02f79
Merge pull request #8 from zeusro/master
add vmess
2018-02-17 04:47:59 -08:00
ASUS laptop
b582b4a308 复原 2018-02-17 09:39:24 +08:00
ASUS laptop
1d9b96fc15 vmess 2018-02-17 09:33:07 +08:00
KiriKira
42c954e6ef beautified 2018-02-01 22:15:53 +08:00
KiriKira
12b2221be9 add TCP+TLS 2018-02-01 22:12:04 +08:00
KiriKira
2853127632
Merge pull request #7 from q158073378252010/2018.01.01.0.0
Remove useless configuration
2018-01-08 21:50:59 +08:00
q158073378252010
66d2079f19
Remove useless configuration 2018-01-01 16:33:03 +08:00
q158073378252010
8f561dcf3e
Merge pull request #3 from KiriKira/master
sync
2018-01-01 16:22:53 +08:00
KiriKira
4b541ef1a0
remove unnecessary mux and ConnectionReuse settings. 2017-12-23 15:18:35 +08:00
KiriKira
061e3ba1d8
Merge pull request #6 from q158073378252010/2017.12.12
Update config_client.json
2017-12-20 22:18:51 +08:00
KiriKira
5e65099c3e
remove header setting from "path" 2017-12-20 20:33:09 +08:00
KiriKira
3fa2221194
remove header setting from path 2017-12-20 20:32:12 +08:00
q158073378252010
f522bd34f6
Update config_client.json
对应 https://github.com/KiriKira/vTemplate/issues/5
2017-12-20 11:52:45 +08:00
KiriKira
72f5017930
Merge pull request #4 from q158073378252010/2017.12.12
Add comments and configuration
2017-12-13 16:34:55 +08:00
q158073378252010
288c6e6759
Update Nginx.config 2017-12-13 02:03:36 +08:00
q158073378252010
0daec119b3
Add comments and configuration 2017-12-13 01:50:41 +08:00
q158073378252010
080cc162e0
Merge pull request #2 from KiriKira/master
sync
2017-12-12 23:44:07 +08:00
kirikira
3519e6b4ed rename Nginx folder 2017-12-12 16:41:19 +08:00
kirikira
e5f97678e2 add Caddy (using header) 2017-12-09 19:03:50 +08:00