Commit Graph

162 Commits (head2_dev)

Author SHA1 Message Date
GeekQu 647efbecc7 Merge branch 'pr/41' into dev 7 years ago
Regend Soh 84ad7f2bf3 feat: add paid user count feature (#814)
* Add paidUserCount function

* Add display of paidUserCount
7 years ago
GeekQu cbd1c5b57f 修排版 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
Regend Soh badc98f29e feat(admin): add aff id change function
* 添加修改用户邀请者

* 添加 chginvite 路由

* 添加chgInvite function
7 years ago
GeekQu 8648e42477 加入用户订阅记录清理 7 years ago
GeekQu 39d22fc924 用户订阅日志可选是否开启,开启请注意导入 user_subscribe_log.sql 7 years ago
GeekQu 8b7258e25a Merge branch 'pr/38' into dev 7 years ago
SukkaW d072da8a12 refactor: remove canvas nest effect 7 years ago
GeekQu 2f69f5c405 用户订阅日志 7 years ago
SukkaW 4f6b4c92ed fix(ticket_view): make avatar align in center 7 years ago
SukkaW f4af6091cc fix(ticket/view): datetime container padding 7 years ago
SukkaW 038bd2e3a9 feat/refactor: minor change related to ticket
- Move editormd css to the head
- Stop user from post reply to closed ticket
7 years ago
SukkaW c060cc65b7 fix(style): admin/ticket_view & user/index 7 years ago
SukkaW 70f6bda903 refactor: remove useless alt attr 7 years ago
SukkaW 689c18275d refactor(ticket_view): avatar style optimized 7 years ago
SukkaW a034138945 refactor(tpl): simplify the code
Use $$getValue instead of document.getElementById(id).value
7 years ago
围墙 96abe52c37
fix detail 7 years ago
Anankke 85558cbb72 fix(ui): unwanted space 7 years ago
SukkaW dc33fb2fb3 fix: literal 7 years ago
Anankke 039144d540 chore(ui): lint 7 years ago
Anankke bfd8d4befe fix(ui): literal 7 years ago
SukkaW f41299d112 refactor: remove jquery & use es6 7 years ago
Anankke 25109792f7 ui: remove obsolete marquee tag
amend
8 years ago
SukkaW 9e1affd1ff fix(icon): back to use fonts.googleapis.com 8 years ago
SukkaW b22c544b42 fix(icon): update material icons 8 years ago
Anankke b7857ab9ce refactor(controller/admin): remove enforced email check when quickCreate 8 years ago
SukkaW cb6083bbce Refactor: remove roboto fonts directly 8 years ago
SukkaW 9f54828c15 Refactor: move material design icons to jsDelivr 8 years ago
Anankke 97ef92a668 fix: smarty literal
after lint
8 years ago
Anankke e8878546b7 refactor: lint template files
you can keep local changes by coping this directory and changing theme config option
8 years ago
Anankke 92d0fdb20b fix: admin main page tag
on 246ab2f392/resources/views/material/admin/main.tpl (L132)
and lint
8 years ago
Anankke 620e9851ed fix: path_search template box width
why repeat yourself?
8 years ago
Anankke 05224fc1ad fix: smarty tags
path_search tag fix
8 years ago
Colinwood11 a8f2a0f3d2 修复无脑CTRL+V (#667) 8 years ago
SukkaW 4e87da9a77 Refactor: change perfops js src 8 years ago
SukkaW 72176279f5 Feat: enable perfops for analytics program 8 years ago
Anankke d19dc0b5a2 remove yft 8 years ago
Colin Huang a6398a346e 修复PushBear关闭时,导致公告无法添加的BUG 8 years ago
Colin Huang 83c1142634 屏蔽空工单回复提醒,修复我之前加的功能为摆设的问题(Markdown不提交,后端不接收)。 8 years ago
Colin Huang fb90616008 修复PushBear无效的问题,配置文件排序 8 years ago
Colin Huang 09a89a5082 添加新公告中支持PushBear推送 8 years ago
laurieryayoi 20be8af0b8 快速创建用户 8 years ago
CGDF 8503c45b2f 解禁用户列表【已用流量、总流量、今日流量】排序 8 years ago
GeekQu 4f23361365 更新
- 支持添加 rico 后端 ss-v2ray-plugin 类型节点
- 更新 clash 配置,以及配置支持 ss
- 添加 ssd 订阅支持 ss-v2ray-plugin 类型节点
- 更新节点列表 v2ray 节点的信息展示
8 years ago
Rico 17ff8dfe22 增加对Rico的V2ray后端中转和Caddy监听的适配 8 years ago
laurieryayoi b3b7f7b142 merge master to dev 8 years ago
laurieryayoi 78fe23fcc0 fix bug 8 years ago
NimaQu c3e83839b6 Merge branch 'master' into dev
# Conflicts:
#	resources/views/material/user/chenPay.tpl
8 years ago