Commit Graph

36 Commits (d19cd3205566b0a23e45cd2e6865efa23cbdd4d8)

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
Malio d971fa429e 支持Wolfpay,修复一些bug 7 years ago
Malio edbebf43fd update 7 years ago
GeekQu 47f3813ec2 fix (sql) 7 years ago
GeekQu c010a67300
调整审计封禁手动封禁流程 7 years ago
GeekQu 02fdf1e90d
Update glzjin_all.sql 7 years ago
GeekQu 758b4272ff
Update glzjin_all.sql 7 years ago
GeekQu f20a405c0c
Create telegram_tasks.sql 7 years ago
Max 3cd4017f37 Merge branch 'malio' of https://gitlab.com/maxitio/malio-theme-for-sspanel into malio
# Conflicts:
#	config/.malio_config.example.php
#	config/routes.php
#	resources/views/malio/index.tpl
#	resources/views/malio/user/code.tpl
#	resources/views/malio/user/index.tpl
#	resources/views/malio/user/shop.tpl
7 years ago
Max 6bdc510cf2 增加多语言支持 7 years ago
Max 3dc8e6001a 防止充值金额重复到账 7 years ago
GeekQu 4f312527ae
网站配置 7 years ago
GeekQu 3c063f5b4b
Merge branch 'pr/43' into dev 7 years ago
SakuraSa233 d01adce482
clean(discord): remove invalid discord bot 7 years ago
GeekQu 245f584a9e 修复 IPv6 访问订阅出现的问题 7 years ago
maxitio 9cc5619fbd 修复 sms_verify.sql 导入失败的问题 7 years ago
maxitio c888980129 支持短信验证码功能 7 years ago
maxitio 5d1dc6b8fc malio_config增加订阅显示等级过期日和流量信息的开关 7 years ago
maxitio dd0c0b471e Merge branch 'malio' of https://gitlab.com/maxitio/malio-theme-for-sspanel into malio 7 years ago
maxitio 1b43d82320 增加登录后弹出式公告(定制) 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 3e30834536 给 Crisp 和 Chatra 增加恢复对话的功能 7 years ago
maxitio fe48719b55 用户中心增加订阅记录页面 7 years ago
GeekQu 39d22fc924 用户订阅日志可选是否开启,开启请注意导入 user_subscribe_log.sql 7 years ago
GeekQu 2f69f5c405 用户订阅日志 7 years ago
Anankke 246ab2f392
儿童节更新 (#668)
Master 儿童节更新

注意加入新的 config 选项
8 years ago
Anankke d19dc0b5a2 remove yft 8 years ago
CGDF 4ac418785b 初步对接discord bot(debug) 8 years ago
Anankke 5c3b8ed5f2 fix argon2i/update config template 8 years ago
chen 187ac7b81f chenpay支付重构 清除不必要&修复报错 8 years ago
chen 9039870bad chenPay sql 8 years ago
Soul Dark 4a09c49886 国旗国家支持正则表达式 9 years ago
NimaQu 7379dfc606 修复bug 9 years ago
NimaQu 97ad9a0d36 清理无用文件 9 years ago
钱半仙 2461adcb14 Initial Commit 9 years ago