Commit Graph

23 Commits (malio-A)

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
Max 4ac06220b9 修复一堆i18n造成的bug 7 years ago
GeekQu e775d9a329
Telegram Bot 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 a2e471d9f9
fix(composer): lost pagination
fix #844
7 years ago
SakuraSa233 093dbc3d48
fix(composer): clean php dependencies 7 years ago
Max 93a20db84f Merge branch 'malio' into 'dev'
# Conflicts:
#   app/Controllers/Mod_Mu/UserController.php
#   composer.json
7 years ago
GeekQu 11353c5364 Merge branch 'pr/39' into dev 7 years ago
SakuraSa233 1811fc0aaa
refactor(composer): clean composer.json 7 years ago
maxitio 9f15cdf088 支持 Stripe 支付接口 7 years ago
Anankke 246ab2f392
儿童节更新 (#668)
Master 儿童节更新

注意加入新的 config 选项
8 years ago
GeekQu 59a5fbfdbc 初步支持自定义 Clash 配置 8 years ago
GeekQu 1dcbbf54e9 Merge branch 'pr/29' into dev 8 years ago
CGDF 4ac418785b 初步对接discord bot(debug) 8 years ago
Rico cab77cff36
add php-dns 8 years ago
SakuraSa233 01d6496020
perf: remove unused phpdotenv 8 years ago
NimaQu 59fd73cd23
update composer.json 8 years ago
Tony Zou b2f39d9217 fix: Alipay F2F notify failed
feat: Added WechatPay support for Trime Pay
	Changed Alipay SDK to Omnipay-alipay
8 years ago
chen 2763fb32f1 chenpay支付重构 改用依赖 新监听方法 详细请看packagist chen-see/chen-pay 优化发送email部分【未测试】。。 8 years ago
Tony Zou 1c068848bf Cloudflare支持,添加节点时自动更新记录 8 years ago
Indexyz 70557a9f92 feat: add uuid deps 9 years ago
钱半仙 2461adcb14 Initial Commit 9 years ago