Commit Graph

211 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 d47bd98773
V2RayN 客户端支持附带节点信息下载 7 years ago
GeekQu f6a94fbdf3
审计封禁支持所有节点对接方式 7 years ago
GeekQu 441a081724
fix(job) 7 years ago
GeekQu 9465a24947
更改文件结构 7 years ago
GeekQu fe2fb3ae29
Merge branch 'pr/46' into dev 7 years ago
GeekQu 08eefe35e6
修复ip判断 7 years ago
GeekQu 730a6e432a
定时任务增加判断 7 years ago
GeekQu 15d9462d3e
Bot +1 7 years ago
GeekQu 6d6a01b3e9
Bot +1 7 years ago
GeekQu a709cfae54
Telegram Bot +1 7 years ago
GeekQu ca36add3f9
修 bot setWebhook 错误提示 7 years ago
GeekQu e775d9a329
Telegram Bot 7 years ago
GeekQu 78a7c0ff14
Xcat 增加清理订阅缓存,增删改节点、增删改中转规则时清理订阅缓存 7 years ago
GeekQu 6997a7fb0c
telegram 推送使用数据库内的配置 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 96db900a6b
增强判断 7 years ago
GeekQu b57f817475
Merge pull request #44 from Anankke/dev
merge 20191128
7 years ago
GeekQu b8d383f8f3
可用 Xcat 执行配置新增检测 7 years ago
GeekQu 4f312527ae
网站配置 7 years ago
TheCGDF 38283cf96d 调整:当余额高于auto_clean_min_money时,即使账户到期后也不会被删除。避免歧义 7 years ago
GeekQu 895410e80f
术后修复 7 years ago
GeekQu 3c063f5b4b
Merge branch 'pr/43' into dev 7 years ago
SakuraSa233 051ffc57f9
clean(cloudxns): remove mostly unused cloudxns 7 years ago
SakuraSa233 74e5f87b84
feat(conf): un-string variable type 7 years ago
SakuraSa233 d01adce482
clean(discord): remove invalid discord bot 7 years ago
GeekQu 588696234e
更新说明 7 years ago
GeekQu eed442a52b
Update PortAutoChange.php 7 years ago
GeekQu 3aabb5c58a PortAutoChange 7 years ago
GeekQu 30e7577b86 Create PortAutoChange.php 7 years ago
GeekQu 5bc4a557b7 修改 sendDiary_Msg 7 years ago
GeekQu 805e602d5a telegram 推送自定义设置 7 years ago
GeekQu 647efbecc7 Merge branch 'pr/41' into dev 7 years ago
maxitio 13277cae81 修复会出现重复uuid的问题,增加注册时自动生成uuid的代码 7 years ago
laurieryayoi ed70ab3ed8 替换update中的System_config为_ENV 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
GeekQu 8648e42477 加入用户订阅记录清理 7 years ago
maxitio 3e30834536 给 Crisp 和 Chatra 增加恢复对话的功能 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 8b7258e25a Merge branch 'pr/38' into dev 7 years ago
围墙 36bd068e58 fix: Telegram webhook not refreshing IP cache (#778) 7 years ago
SukkaW 5c7a10c9d8 refactor(dailyjob): download qqwry.dat directly 7 years ago
SukkaW 58a0ae155c refactor(xcat): minor updates
- Fix QQWry download info output
- Add git gc for initdownload
7 years ago
imjonat 3dfcf13da2 fix: to fix server酱 恢复上线标题有误 (#736) 7 years ago
Max 247897eb5a Merge branch 'malio' into 'dev'
# Conflicts:
#   .gitignore
#   app/Middleware/Mod_Mu.php
#   app/Services/Payment.php
#   config/.config.example.php
7 years ago
GeekQu 41c37ee92c Merge branch 'pr/37' into dev 7 years ago
maxitio d8dfb8bfce 忘记写分号 7 years ago
maxitio 270836e631 现在可以在网站目录下执行 php xcat update 更新了 (暂未测试过) 7 years ago