Malio
|
76517c9172
|
Merge remote-tracking branch 'origin/dev' into malio
# Conflicts:
# README.md
# app/Command/Update.php
# app/Command/XCat.php
# app/Controllers/AuthController.php
# app/Controllers/HomeController.php
# app/Controllers/Mod_Mu/UserController.php
# app/Controllers/UserController.php
# app/Models/User.php
# app/Services/Gateway/TomatoPay.php
# app/Services/Gateway/YftPayUtil.php
# app/Services/Payment.php
# composer.json
# config/.config.example.php
# config/routes.php
|
7 years ago |
GeekQu
|
fe2fb3ae29
|
Merge branch 'pr/46' into dev
|
7 years ago |
GeekQu
|
78a7c0ff14
|
Xcat 增加清理订阅缓存,增删改节点、增删改中转规则时清理订阅缓存
|
7 years ago |
Max
|
edaad4aec6
|
Merge branch 'dev' of https://gitlab.com/maxitio/malio-theme-for-sspanel into malio
# Conflicts:
# README.md
# app/Command/Update.php
# app/Controllers/UserController.php
# app/Middleware/Mod_Mu.php
# app/Models/User.php
# app/Services/Gateway/TomatoPay.php
# app/Services/Payment.php
# app/Utils/TelegramProcess.php
# app/Utils/URL.php
# config/.config.example.php
|
7 years ago |
Rico
|
aa1fe9be44
|
1.删除用户页面v2ray中转设置
2.管理员中转配置,Port是指本地监听,只能中转V2ray相关节点配置
|
7 years ago |
maxitio
|
45baaa4a21
|
支持中转规则
|
7 years ago |
GeekQu
|
56efadeab9
|
兼容后端修改,小火箭独立订阅地址
|
8 years ago |
Anankke
|
98368c63f4
|
小场面
|
8 years ago |
Anankke
|
ffc1fe3fe5
|
优化(?
|
8 years ago |
Anankke
|
af7ce96e78
|
修缩进
|
8 years ago |
GeekQu
|
9ab4b96c06
|
修正 v2 节点有使用 outside_port 的情况
|
8 years ago |
Rico
|
5ffed40afe
|
继续修复
|
8 years ago |
Rico
|
88f7585822
|
修复端口为0或者空造成的中转问题
|
8 years ago |
Rico
|
81b6e15132
|
修复中转端口判断的bug
|
8 years ago |
Rico
|
17ff8dfe22
|
增加对Rico的V2ray后端中转和Caddy监听的适配
|
8 years ago |
CGDF
|
4900fd6440
|
清除膜蛤文字
|
8 years ago |
钱半仙
|
2461adcb14
|
Initial Commit
|
9 years ago |