Masivro
23014aad36
Merge branch 'patch-1' into 'malio'
...
修复重置周期最后一天的下次重置显示问题
See merge request masivro/malio-theme-for-sspanel!42
7 years ago
孔雀
af2a7d2a41
Support Trojan
7 years ago
lithromantic
196a8bc151
修复重置周期最后一天的下次重置显示问题
7 years ago
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
GeekQu
1c455e0b3c
Merge branch 'pr/50' into dev
7 years ago
v2rayv3
73cdeb69a9
修复php 7.3 下 undefined offset的问题
7 years ago
GeekQu
3de1210f39
管理页面节点列表显示节点出口地址
7 years ago
GeekQu
733a11048d
修复管理后台用户编辑解封时间不正确
7 years ago
GeekQu
6c863f745b
管理员、用户查询增加套餐信息
7 years ago
GeekQu
56cfbfe67d
遗漏
7 years ago
GeekQu
049f71d913
Bot +1
7 years ago
GeekQu
478339ff4f
Update Node.php
7 years ago
GeekQu
e95205d203
Update Node.php
7 years ago
GeekQu
0d2b25b4e2
修复 ssd 订阅,
7 years ago
GeekQu
41a44f3c12
用户中心显示套餐已使用天数、下次流量重置时间、套餐过期时间
7 years ago
GeekQu
6d6a01b3e9
Bot +1
7 years ago
GeekQu
fa7933966f
单用户购买记录页
7 years ago
GeekQu
f922d60e9d
Bot +1
7 years ago
GeekQu
df9f9009a5
Bot +1
7 years ago
GeekQu
c0fb19dbf4
Telegram Bot
7 years ago
GeekQu
653e82f1c4
Telegram Bot
7 years ago
GeekQu
1ca33982b2
修手残
7 years ago
GeekQu
b2d78c0d63
Telegram Bot
7 years ago
Max
edaad4aec6
Merge branch 'dev' of https://gitlab.com/maxitio/malio-theme-for-sspanel into malio
...
# Conflicts:
# README.md
# app/Command/Update.php
# app/Controllers/UserController.php
# app/Middleware/Mod_Mu.php
# app/Models/User.php
# app/Services/Gateway/TomatoPay.php
# app/Services/Payment.php
# app/Utils/TelegramProcess.php
# app/Utils/URL.php
# config/.config.example.php
7 years ago
GeekQu
457e4277ca
用户修改连接密码、重置端口、更改加密协议混淆、重置订阅链接、以及删除账户时自动清理订阅缓存
7 years ago
Rico
c9b3d22040
修复 流水统计的报错
7 years ago
GeekQu
4f312527ae
网站配置
7 years ago
GeekQu
3c063f5b4b
Merge branch 'pr/43' into dev
7 years ago
SakuraSa233
74e5f87b84
feat(conf): un-string variable type
7 years ago
錢爸爸
0a4f629226
random gravatar avatar
7 years ago
錢爸爸
30e24b24c3
admin/user add obfs_param
7 years ago
Regend Soh
1279aea9cf
Fix: MySQL 8.0 support for income calculation ( #856 )
...
* Fix: MySQL 8.0 support for income calculation
* Fix: MySQL 8.0 support for income calculation
7 years ago
Regend Soh
e4329a7661
Fix bug: display last month Income
...
Ref: https://stackoverflow.com/questions/19727274/strtotime-bug-when-using-1-month-from-january
7 years ago
Regend Soh
d217000ca2
Simplify if...else statement from previous commit
...
as mentioned.
7 years ago
Regend Soh
532f2f457f
Fix bug for income calculation
...
Fix bug as mentioned by @topjohncian
7 years ago
GeekQu
647efbecc7
Merge branch 'pr/41' into dev
7 years ago
maxitio
c888980129
支持短信验证码功能
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
Anankke
e42e5ee3e0
refactor: 129137b773 (r35233741)
7 years ago
SukkaW
e1907e3b7b
refactor(gravatar): minor updates
7 years ago
Regend Soh
c92a52df64
feat: add function to display disable reason for disabled accounts ( #815 )
...
* Add disableReason Function
* Added disable reason based on 审计规则
7 years ago
錢爸爸
129137b773
Restore Gravatar function
7 years ago
Regend Soh
84ad7f2bf3
feat: add paid user count feature ( #814 )
...
* Add paidUserCount function
* Add display of paidUserCount
7 years ago
GeekQu
be0cb7f93a
审计封禁
7 years ago
Regend Soh
89ea1b75d8
feat: add display income feature ( #813 )
...
* Adding income calculation function
Below functions are added:
- yesterday_income()
- today_income()
- this_month_income()
- last_month_income()
- total_income()
* Add income display on /admin/code page
Display the following information at /admin/code
- Today's income
- Yesterday's income
- This month's income
- Last month's income
- Total income
* Reformatting code style
Reformat the code, attempting to follow the standard required.
* Refactor to camel case naming
* Refactor to camel case naming
* Reformat due to spacing and tabbing issue
7 years ago
Bill Huang
46a184b289
支持QQ邮箱用户爬取QQ头像
7 years ago
Max
bc8e20ac00
Merge branch 'malio' into 'dev'
...
# Conflicts:
# README.md
# app/Command/Update.php
# app/Controllers/UserController.php
# app/Services/Payment.php
7 years ago
GeekQu
8b7258e25a
Merge branch 'pr/38' into dev
7 years ago
Max
a1181edd3d
Merge branch 'malio' into 'dev'
...
# Conflicts:
# app/Controllers/LinkController.php
7 years ago
GeekQu
2f69f5c405
用户订阅日志
7 years ago