Commit Graph

66 Commits (fdf582dcdfd97eb6fae93cbcabafd3c7dee2b824)

Author SHA1 Message Date
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
v2rayv3 90a746a633 和quan 统一使用host 7 years ago
GeekQu 7c817b6174
修复无法获取 VMess kcp 节点 7 years ago
GeekQu 7814d7ec83
Tools 格式化 7 years ago
GeekQu 4326f52b8e
可配置将订阅中单端口的信息去除 7 years ago
GeekQu fe2fb3ae29
Merge branch 'pr/46' into dev 7 years ago
v2rayv3 05054f2910 localserver应该是add覆盖前的 7 years ago
v2rayv3 043ff80923 修复逻辑bug,应该是peer是落地的地址信息 7 years ago
GeekQu 4009d7d883
rico obfs 7 years ago
GeekQu f922d60e9d
Bot +1 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
GeekQu 2911b9e7a7
Merge branch 'pr/60' into dev 7 years ago
GeekQu 8b004688c9
修复端口偏移 7 years ago
Rico aa1fe9be44 1.删除用户页面v2ray中转设置
2.管理员中转配置,Port是指本地监听,只能中转V2ray相关节点配置
7 years ago
Rico 95e96d2c99 测试增加小火箭 mkcp订阅支持 7 years ago
GeekQu 777c409031
修改 ss-v2ray-plugin 节点默认 host 为 microsoft.com 7 years ago
GeekQu c7d2b5f614
订阅信息缓存 7 years ago
GeekQu 3c063f5b4b
Merge branch 'pr/43' into dev 7 years ago
SakuraSa233 74e5f87b84
feat(conf): un-string variable type 7 years ago
Rico cf12b34262 修改flag,看着不是很丑了 7 years ago
Rico 273e6c39c2 修改小火箭,在有relayserver和tls的前提下,允许非安全 7 years ago
GeekQu 2db61fb807 包含订阅信息的客户端下载方式 7 years ago
GeekQu 7911c76057
Merge pull request #59 from GeekQu/dev
修复 Shadowrocket ss-v2ray-plugin 节点的编码错误
7 years ago
GeekQu 31b53a0052 getPcClient 7 years ago
GeekQu 0a4cda9047
Merge pull request #58 from GeekQu/dev
20191015
7 years ago
GeekQu 6dab034a26 emoji 7 years ago
Max 003817fc9f Merge branch 'dev' into 'malio'
PR 2019-09-30

See merge request maxitio/malio-theme-for-sspanel!18
7 years ago
Rico 202fd74361 增加中转的server key 是relayserver 7 years ago
Max 93a20db84f Merge branch 'malio' into 'dev'
# Conflicts:
#   app/Controllers/Mod_Mu/UserController.php
#   composer.json
7 years ago
GeekQu f1a7996979 现在可以配置为中转规则直接下发偏移后的端口了 7 years ago
Max d1909d1f77 Merge branch 'malio' into 'dev'
# Conflicts:
#   config/.config.example.php
7 years ago
GeekQu 65d7b0cfa9 修复小火箭订阅 7 years ago
maxitio 45baaa4a21 支持中转规则 7 years ago
GeekQu 06595e2abd
Merge branch 'dev' into dev 7 years ago
GeekQu a9104e94e4 修复233 7 years ago
GeekQu 7666bc7a09 +1s 7 years ago
GeekQu a9ed6a5461 Update Tools.php 7 years ago
Rico f5b8887457
Merge pull request #37 from GeekQu/dev
兼容后端改变以及小火箭的独立订阅
8 years ago
GeekQu 56efadeab9 兼容后端修改,小火箭独立订阅地址 8 years ago
GeekQu 7b30b6da59 fixed bug 8 years ago
Rico 4e2443c394 fix: 修复端口设置为0,本地监听时候,订阅端口不切成0的bug (#680) 8 years ago
Rico 4aef671252 修复端口设置为0 或者空的时候 不切443 8 years ago
GeekQu ac20d3c515 Merge branch 'pr/34' into dev 8 years ago
Anankke 246ab2f392
儿童节更新 (#668)
Master 儿童节更新

注意加入新的 config 选项
8 years ago
Anankke 963cfc5b75 Utils 优化 8 years ago
GeekQu 880c9d3d1e 修正 Clash ss 节点异常输出 obfs-host (#665)
* 修正 Clash ss 节点异常输出 obfs-host

* +1
8 years ago
GeekQu f201f3f2d1 优化+1 8 years ago
GeekQu 957d0a5a39 fixed bug 8 years ago
GeekQu 45ed0a8fd5 Merge branch 'pr/31' into dev 8 years ago