Commit Graph

137 Commits (fdf582dcdfd97eb6fae93cbcabafd3c7dee2b824)

Author SHA1 Message Date
孔雀 af2a7d2a41
Support Trojan 7 years ago
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 3de1210f39
管理页面节点列表显示节点出口地址 7 years ago
GeekQu c010a67300
调整审计封禁手动封禁流程 7 years ago
GeekQu fe2fb3ae29
Merge branch 'pr/46' into dev 7 years ago
GeekQu d7d83c2b0d
单用户购买记录页 添加套餐 7 years ago
GeekQu 6b9d5800d3
单用户购买记录页 删除记录 7 years ago
GeekQu fa7933966f
单用户购买记录页 7 years ago
GeekQu a984e01afb
修复显示问题 7 years ago
GeekQu 78a7c0ff14
Xcat 增加清理订阅缓存,增删改节点、增删改中转规则时清理订阅缓存 7 years ago
GeekQu f02d933b8f
修复手贱 7 years ago
GeekQu 3150594b86
修复上一条commit遗漏 7 years ago
GeekQu 6997a7fb0c
telegram 推送使用数据库内的配置 7 years ago
GeekQu a116d92e00
后台清理用户订阅缓存增加成功提示 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 96db900a6b
增强判断 7 years ago
Rico aa1fe9be44 1.删除用户页面v2ray中转设置
2.管理员中转配置,Port是指本地监听,只能中转V2ray相关节点配置
7 years ago
GeekQu c7d2b5f614
订阅信息缓存 7 years ago
GeekQu f0cb4b710a
修复 7 years ago
GeekQu 4f312527ae
网站配置 7 years ago
GeekQu 895410e80f
术后修复 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
zeva20 accd82e754 fix(user) Fix missing obfs_param data 7 years ago
錢爸爸 da7ca38780
admin/user add obfs_param
就是喜歡在web直接水Commit
7 years ago
maxitio e26a94a2b3 修复工单bug 7 years ago
GeekQu fea0fc9580 telegram 推送自定义设置 2 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
GeekQu be0cb7f93a 审计封禁 7 years ago
maxitio d5957b86c8 stripe支付支持自定义货币 7 years ago
maxitio 030c2986b5 增加工单TG Bot通知 7 years ago
Max bc8e20ac00 Merge branch 'malio' into 'dev'
# Conflicts:
#   README.md
#   app/Command/Update.php
#   app/Controllers/UserController.php
#   app/Services/Payment.php
7 years ago
GeekQu ddcbd4fa0f V2Ray、Shadowsocks - V2Ray-Plugin 节点默认单端口多用户 7 years ago
Max a1181edd3d Merge branch 'malio' into 'dev'
# Conflicts:
#   app/Controllers/LinkController.php
7 years ago
maxitio 8ff3ad2f0c 优化工单系统(新邮件皮肤) 7 years ago
GeekQu 0cdb8c46dc fix 7 years ago
GeekQu 2f69f5c405 用户订阅日志 7 years ago
GeekQu 56efadeab9 兼容后端修改,小火箭独立订阅地址 8 years ago
GeekQu 26dcd1fadc Merge branch 'pr/35' into dev 8 years ago
Anankke b7857ab9ce refactor(controller/admin): remove enforced email check when quickCreate 8 years ago
GeekQu ac20d3c515 Merge branch 'pr/34' into dev 8 years ago
Anankke 246ab2f392
儿童节更新 (#668)
Master 儿童节更新

注意加入新的 config 选项
8 years ago
Anankke 3fde99fe68 PSR 12 8 years ago
Colinwood11 a8f2a0f3d2 修复无脑CTRL+V (#667) 8 years ago
Anankke 2443a0f392 Controller 优化&&修复 8 years ago
GeekQu 45ed0a8fd5 Merge branch 'pr/31' into dev 8 years ago
Anankke af7ce96e78 修缩进 8 years ago
GeekQu e23072d3d8 Merge branch 'pr/30' into dev 8 years ago
Colin Huang eac0f88a0a 手残+1 8 years ago