Commit Graph

84 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
GeekQu d47bd98773
V2RayN 客户端支持附带节点信息下载 7 years ago
GeekQu b3dac73008
调整 telegram bot 绑定流程:支持手动发送绑定码绑定 7 years ago
GeekQu a709cfae54
Telegram Bot +1 7 years ago
GeekQu b889f2b366
Telegram Bot 7 years ago
GeekQu f02d933b8f
修复手贱 7 years ago
GeekQu 3150594b86
修复上一条commit遗漏 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 083826931a
后台用户编辑未开启订阅缓存时不显示清理选项 7 years ago
GeekQu b57f817475
Merge pull request #44 from Anankke/dev
merge 20191128
7 years ago
GeekQu 4f312527ae
网站配置 7 years ago
Miku 8bfa574c7f
Update Config.php 7 years ago
GeekQu 3c063f5b4b
Merge branch 'pr/43' into dev 7 years ago
GeekQu 2db61fb807 包含订阅信息的客户端下载方式 7 years ago
GeekQu 60e82fc07f 修改客户端下载链接 7 years ago
GeekQu 647efbecc7 Merge branch 'pr/41' into dev 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
SakuraSa233 91b2bf2016
feat(config): store config to $_ENV 7 years ago
SakuraSa233 fb8bd622fb
clean(services\config): unused env set function 7 years ago
GeekQu 8648e42477 加入用户订阅记录清理 7 years ago
Max 84cf80dd79 Merge branch 'malio' into 'dev'
# Conflicts:
#   app/Controllers/LinkController.php
7 years ago
GeekQu ec5091080f 修改 Surge、Clash、Surfboard 策略组 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 49fea06df7 可选用户流量耗尽后不断网 7 years ago
GeekQu 39d22fc924 用户订阅日志可选是否开启,开启请注意导入 user_subscribe_log.sql 7 years ago
Max a1181edd3d Merge branch 'malio' into 'dev'
# Conflicts:
#   app/Controllers/LinkController.php
7 years ago
maxitio e7ac894ef5 修复重置订阅链接的显示问题 7 years ago
GeekQu 1142c08f39 船新的 Clash 配置 7 years ago
GeekQu 24e4cbdd5e
Merge pull request #36 from Anankke/dev
Merge dev 20190628
8 years ago
Anankke b5429b5dfa fix: lost functions 8 years ago
GeekQu ac20d3c515 Merge branch 'pr/34' into dev 8 years ago
GeekQu 97140bf279 fixed bug 8 years ago
Anankke 246ab2f392
儿童节更新 (#668)
Master 儿童节更新

注意加入新的 config 选项
8 years ago
Anankke c0b1c4929a Service 部分优化 8 years ago
Anankke af7ce96e78 修缩进 8 years ago
CGDF 4ac418785b 初步对接discord bot(debug) 8 years ago
laurieryayoi e79f0e43d0 修复service&充值记录表格初始化渲染 8 years ago
laurieryayoi 093d63a5f5 Merge branch 'master' into dev 8 years ago
laurieryayoi c0f827cf28 删除眼花多加的代码 8 years ago
laurieryayoi b3b7f7b142 merge master to dev 8 years ago
laurieryayoi 78fe23fcc0 fix bug 8 years ago
NimaQu c3e83839b6 Merge branch 'master' into dev
# Conflicts:
#	resources/views/material/user/chenPay.tpl
8 years ago
Sukka 282f335e91 Feat: add sspanelAnalysis (#553) 8 years ago
CGDF 248d607837 使用mylivechat取代crisp 8 years ago
NimaQu 8b2c5ee896
Revert "删除enable_analytics_code"
This reverts commit 900fb910d0.
8 years ago
CGDF 900fb910d0 删除enable_analytics_code 8 years ago
laurieryayoi 708661ae5c index添加注册页面&登出时路 由调整 8 years ago
laurieryayoi 1f08dd0ee9 index页面登录功能 8 years ago
CGDF 0426014191 调整footer 8 years ago