Commit Graph

26 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 6bdc510cf2 增加多语言支持 7 years ago
GeekQu 3b85685260
Update .gitignore 7 years ago
maxitio 6158bb240a 适配邮件模板(如果收到没适配的邮件,请通知我) 7 years ago
Max 247897eb5a Merge branch 'malio' into 'dev'
# Conflicts:
#   .gitignore
#   app/Middleware/Mod_Mu.php
#   app/Services/Payment.php
#   config/.config.example.php
7 years ago
maxitio d45e7eb915 一大波更新 7 years ago
maxitio ccc0ed1d46 马里奥来了 7 years ago
SukkaW 0a0a861f37 ci: bring up lintTpl.sh 7 years ago
Anankke 79291c3c38 chore: add .php_cs.cache to .gitignore 8 years ago
Anankke 1423812524 fix: missing storage directory and subdirectories 8 years ago
Anankke 73451d7f37 更新 gitignore 8 years ago
Anankke 076073f808 Update gitignore 8 years ago
SakuraSa233 df06991108
rm: composer lock file 8 years ago
laurieryayoi f8a1478f23 重传预编译文件 8 years ago
CGDF 248d607837 使用mylivechat取代crisp 8 years ago
NimaQu 483da09343
update gitignore 8 years ago
Tony Zou 55ddf4df5c 新增用户流量过低邮件提醒,支持百分比/MB阀值。 8 years ago
Soul Dark 9726e211e5 更新gitignore,防止出事 8 years ago
NimaQu 1369a7b2f4 update gitignore 9 years ago
Soul Dark 14afad7ab0 新增自定义混淆参数(以支持运营商免流)
顺便给主页加了一个退出登录的<li>
为.gitignore新增了一条.vs/
9 years ago
Indexyz e5ab08246f fix: fix v2ray display
fix: fix nodeLoad error if no value
9 years ago
NimaQu 7379dfc606 修复bug 9 years ago
NimaQu 73fee22154 在不使用易付通的时候隐藏管理面板的充值记录 9 years ago
leo c624af4395 modified gitignore 9 years ago
NimaQu 944c3eafe9 modified gitignore 9 years ago
钱半仙 2461adcb14 Initial Commit 9 years ago