Commit Graph

106 Commits (head2_dev)

Author SHA1 Message Date
GeekQu 805e602d5a telegram 推送自定义设置 7 years ago
GeekQu be0cb7f93a 审计封禁 7 years ago
GeekQu 8648e42477 加入用户订阅记录清理 7 years ago
GeekQu 8b7258e25a Merge branch 'pr/38' into dev 7 years ago
SukkaW 5c7a10c9d8 refactor(dailyjob): download qqwry.dat directly 7 years ago
imjonat 3dfcf13da2 fix: to fix server酱 恢复上线标题有误 (#736) 7 years ago
GeekQu 41c37ee92c Merge branch 'pr/37' into dev 7 years ago
laurieryayoi 47e00446df 坑死我了 7 years ago
Rico 08484f9aac 排除已经中止的套餐 7 years ago
SukkaW 6f9dc1300d feat(job): add 'git gc' to updatedownload 7 years ago
GeekQu 24e4cbdd5e
Merge pull request #36 from Anankke/dev
Merge dev 20190628
7 years ago
Anankke c5e0f9dc3d fix: memory exhausted in backup 8 years ago
Anankke 95840d0833 fix: memory exhausted in cli
给带机场的修复,daily job 有问题的请升级
8 years ago
Anankke 8943237c86 chore: lint 8 years ago
GeekQu ac20d3c515 Merge branch 'pr/34' into dev 8 years ago
Anankke 246ab2f392
儿童节更新 (#668)
Master 儿童节更新

注意加入新的 config 选项
8 years ago
Anankke 3c0907281c Command 部分优化 8 years ago
GeekQu 7b1e789cd0 Merge branch 'pr/32' into dev 8 years ago
Anankke 7956597953 remove tmt 8 years ago
topjohncian 90eefe0c16
更新Job
增加节点掉线推送到Server酱
8 years ago
GeekQu 45ed0a8fd5 Merge branch 'pr/31' into dev 8 years ago
Anankke af7ce96e78 修缩进 8 years ago
Rico 96fe200f13 修改if判断代码风格 8 years ago
Rico 0180a58892 修改if判断代码风格 8 years ago
Rico b8ae004f8f 修改判断位置 8 years ago
Rico 19d2d617ba 修改判断位置 8 years ago
Rico 2f9cbdc47e 在自定义重置日期的时候,过滤掉现在已经有套餐在身的用户(被坑了/(ㄒoㄒ)/~~ ) 8 years ago
Rico 3d086d3679 对每日数据重置用户做过滤,过滤掉有套餐在身的用户 8 years ago
Rico c5c28bbb15 Merge branch 'A-dev' into dev 8 years ago
CGDF a090b9ce6b 修复mailgun附件 8 years ago
GeekQu bc652297cf
修正误写 8 years ago
GeekQu 1dcbbf54e9 Merge branch 'pr/29' into dev 8 years ago
GeekQu 4f23361365 更新
- 支持添加 rico 后端 ss-v2ray-plugin 类型节点
- 更新 clash 配置,以及配置支持 ss
- 添加 ssd 订阅支持 ss-v2ray-plugin 类型节点
- 更新节点列表 v2ray 节点的信息展示
8 years ago
Rico 973bed49fb Merge branch 'dev' of git://github.com/GeekQu/ss-panel-v3-mod_Uim into GeekQu-dev
增加v2ray ss+ws配置
# Conflicts:
#	app/Command/Job.php
#	app/Command/XCat.php
#	app/Controllers/RelayController.php
#	app/Controllers/UserController.php
#	resources/views/material/user/edit.tpl
8 years ago
GeekQu 628aa4ee24 Merge branch 'pr/23' into dev 8 years ago
GeekQu 3036497f0f 支持 ss-v2ray-plugin 类型节点
域名;端口;ws;tls;路径;额外参数
8 years ago
Rico 17ff8dfe22 增加对Rico的V2ray后端中转和Caddy监听的适配 8 years ago
Rico 54710c60ac 修复bug 8 years ago
Rico 4295dead69 Merge branch 'dev' of git://github.com/Anankke/ss-panel-v3-mod_Uim into Anankke-dev
# Conflicts:
#	resources/views/material/user/edit.tpl
#	resources/views/material/user/index.tpl
更新上游,并修复v2ray 中转节点有些信息不更新或者显示的问题
8 years ago
Rico 899597011e Merge branch 'Anankke-dev' into dev
# Conflicts:
#	resources/views/material/user/index.tpl
8 years ago
Rico a75f665923
Merge pull request #23 from Anankke/dev
update
8 years ago
Rico 3584d95d2a 增加v2ray中转字样,TODO replay的rule回复 8 years ago
CGDF abe8359ecb 修复内网中转bug 8 years ago
Rico b6962cb8a0 Merge branch 'dev' of git://github.com/Anankke/ss-panel-v3-mod_Uim into Anankke-dev
# Conflicts:
#	app/Command/XCat.php
#	resources/views/material/user/index.tpl
8 years ago
CGDF 3a002f7ddf 全量备份选项 8 years ago
Rico 4e243f6ec7
增加127.0.0.1的问题处理使用dns over https google 8 years ago
CGDF de112cd7fc 修复syncjob不能自动更新 8 years ago
CGDF 278968c882 修复脑残写的BUG。。。 8 years ago
CGDF fc010bd0e5 修复邮件轰炸和账户过期时ssr订阅 8 years ago
CGDF 3b548381cb 修复账户过期时ssr订阅 8 years ago