Commit Graph

26 Commits (b82784d6b2c4482fd01d8bdf9d2f5d2ed83ae2ec)

Author SHA1 Message Date
Max 581585cdb6 Merge branch 'malio' into 'dev'
# Conflicts:
#   README.md
#   app/Command/Update.php
#   app/Controllers/AuthController.php
#   app/Controllers/UserController.php
#   app/Middleware/Mod_Mu.php
#   app/Models/User.php
#   app/Services/Gateway/TomatoPay.php
#   app/Services/Gateway/YftPayUtil.php
#   app/Services/Payment.php
#   app/Utils/TelegramProcess.php
#   app/Utils/URL.php
#   config/.config.example.php
#   config/routes.php
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