1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 10:08:15 -05:00
Commit Graph

3533 Commits

Author SHA1 Message Date
Darien Raymond
8235ab055b
Merge branch 'master' of https://github.com/v2ray/v2ray-core 2018-04-12 17:44:25 +02:00
Darien Raymond
2f74a5d048
disable domain socket for windows 2018-04-12 17:44:23 +02:00
DarienRaymond
d86e28de5f
Merge pull request #1045 from sunshineplan/patch-1
Update install-release.sh
2018-04-12 16:21:29 +02:00
sunshineplan
adcdad368f
Update install-release.sh 2018-04-12 21:56:19 +08:00
DarienRaymond
7f78775ebe
Merge pull request #1041 from sunshineplan/5
install-release.sh将所有exit改为return,并在适当的地方增删return,目的是增加脚本可读性
2018-04-12 15:40:13 +02:00
DarienRaymond
72e61b3370
Merge branch 'master' into 5 2018-04-12 15:40:04 +02:00
sunshineplan
b0ded2f5a6
Update install-release.sh 2018-04-12 21:38:18 +08:00
DarienRaymond
bc2d2ae866
Merge pull request #1037 from sunshineplan/2
install-release.sh检查版本功能更新
2018-04-12 15:19:32 +02:00
sunshineplan
90ad6bb121
Update install-release.sh 2018-04-12 19:00:13 +08:00
sunshineplan
8f8e393e5f
Update install-release.sh 2018-04-12 18:18:26 +08:00
DarienRaymond
7d800168aa
Merge pull request #1039 from sunshineplan/4
install-release.sh增加启动和停止服务失败的提醒
2018-04-12 11:20:06 +02:00
sunshineplan
1097ed96f2
Update install-release.sh 2018-04-12 16:56:00 +08:00
DarienRaymond
7ead80c792
Merge pull request #1038 from sunshineplan/3
install-release.sh中copyFile功能简化
2018-04-12 10:46:32 +02:00
sunshineplan
765c44c2ac
Update install-release.sh 2018-04-12 16:03:40 +08:00
sunshineplan
fe5d3adecc
Update install-release.sh 2018-04-12 16:03:06 +08:00
Darien Raymond
8d27d3c87e
Merge branch 'master' of https://github.com/v2ray/v2ray-core 2018-04-12 09:57:42 +02:00
Darien Raymond
fe58cec5e3
fix syncPolicyManager 2018-04-12 09:57:41 +02:00
sunshineplan
e6ac13bf8c
Update install-release.sh 2018-04-12 15:57:04 +08:00
sunshineplan
ee1a49bf25
Update install-release.sh 2018-04-12 15:50:33 +08:00
DarienRaymond
8438b9b500
Merge pull request #1035 from sunshineplan/1
install-release.sh当/etc/v2ray/config.json存在时,不再生成/etc/v2ray文件夹,并修复缩进
2018-04-12 09:49:02 +02:00
sunshineplan
266042a250
Update install-release.sh 2018-04-12 15:48:32 +08:00
sunshineplan
de163ba487
Update install-release.sh 2018-04-12 15:46:52 +08:00
sunshineplan
e154ff3dfd
Update install-release.sh 2018-04-12 15:45:46 +08:00
sunshineplan
648b7e35f1
Update install-release.sh 2018-04-12 15:41:35 +08:00
sunshineplan
f479f0094f
Update install-release.sh 2018-04-12 15:16:50 +08:00
sunshineplan
a12ec47cad
Update install-release.sh 2018-04-12 14:52:35 +08:00
sunshineplan
58794ddcb4
Update install-release.sh 2018-04-12 14:18:40 +08:00
sunshineplan
3f1bb73e2a
Update install-release.sh 2018-04-12 14:15:21 +08:00
sunshineplan
78ac8470b5 Update install-release.sh 2018-04-12 14:06:14 +08:00
sunshineplan
5784d3ce9c 将所有exit改为return,并在适当的地方增加return
目的是增加脚本可读性
2018-04-12 14:01:19 +08:00
sunshineplan
d4124dfe9b Revert "将所有exit改为return,并在适当的地方增加return"
This reverts commit cace23b822.
2018-04-12 13:52:37 +08:00
sunshineplan
cace23b822 将所有exit改为return,并在适当的地方增加return
目的是增加脚本可读性
2018-04-12 13:23:39 +08:00
sunshineplan
bb2f6d006e 增加启动和停止服务失败的提醒 2018-04-12 13:17:48 +08:00
sunshineplan
a0fd5ba056 copyFile功能简化 2018-04-12 13:12:12 +08:00
sunshineplan
c56b55a7d3 检查版本功能更新
检查新版本时增加检测本地是否安装的情况
使用version参数时,不需要键入v,直接打版本号即可
2018-04-12 10:53:05 +08:00
sunshineplan
5b1b771d2e 修复缩进,当/etc/v2ray/config.json存在时,不再生成/etc/v2ray文件夹 2018-04-12 10:24:18 +08:00
Darien Raymond
a06078ecb3
fix test 2018-04-12 00:28:20 +02:00
Darien Raymond
c76d492c0f
stats counter for inbound traffic 2018-04-12 00:10:14 +02:00
Darien Raymond
3e8da9e540
fix delay in blackhole 2018-04-11 23:02:10 +02:00
Darien Raymond
d2470e2cdb
fix lint errors 2018-04-11 20:17:19 +02:00
Darien Raymond
622cb529a9
include base error 2018-04-11 20:17:08 +02:00
Darien Raymond
666a1a17f2
fix test 2018-04-11 16:52:51 +02:00
Darien Raymond
0caf92726b
better way to run tasks in parallel 2018-04-11 16:45:09 +02:00
Darien Raymond
9d7f43a299
fix lint errors 2018-04-11 16:15:29 +02:00
Darien Raymond
044c641d7b
test case for tls certs 2018-04-10 23:02:47 +02:00
Darien Raymond
02941b66a0
add tags to ext 2018-04-10 22:23:25 +02:00
Darien Raymond
318a36fe58
automatic issuing certificates from provided CA 2018-04-10 12:42:02 +02:00
Darien Raymond
8ba8ce7d6a
more options for generating certificate 2018-04-09 23:17:55 +02:00
Darien Raymond
b7fc1f0bd6
scenario test for domain socket 2018-04-09 20:45:23 +02:00
Darien Raymond
38de82a5d3
don't release locker in abstract mode 2018-04-09 17:18:48 +02:00