Commit Graph

15 Commits (merge_upstream)

Author SHA1 Message Date
Rico 5ddb11226f Merge branch 'A-dev' into merge_upstream
# Conflicts:
#	app/Command/Job.php
#	app/Controllers/Admin/UserController.php
#	app/Controllers/Client/ClientApiController.php
#	app/Controllers/HomeController.php
#	app/Controllers/LinkController.php
#	app/Controllers/UserController.php
#	app/Middleware/Mod_Mu.php
#	app/Models/User.php
#	app/Services/Config.php
#	app/Services/Gateway/TomatoPay.php
#	app/Services/Gateway/TrimePay.php
#	app/Services/Payment.php
#	app/Utils/TelegramProcess.php
#	app/Utils/Tools.php
#	app/Utils/URL.php
#	composer.json
#	config/.config.example.php
#	resources/clients/ss-win/使用注意.txt
#	resources/clients/ssd-win/使用注意.txt
#	resources/clients/ssr-win/使用注意.txt
#	resources/views/material/user/index.tpl
#	sql/glzjin_all.sql
7 years ago
SakuraSa233 d01adce482
clean(discord): remove invalid discord bot 7 years ago
GeekQu be0cb7f93a 审计封禁 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