Commit Graph

152 Commits (c19ffcf57b4e326bdab10d63e337bc00a88048af)

Author SHA1 Message Date
GeekQu 26dcd1fadc Merge branch 'pr/35' into dev 8 years ago
Anankke 32535c6d17 feat(xcat): add getCookie method for testing purposes
example: php xcat getCookie 1
return  $key $expiretime
8 years ago
Anankke baaf7333f3 feat(xcat): expand createAdmin for testing purposes
example: php xcat createAdmin 114514@1919.com 810
8 years ago
GeekQu ac20d3c515 Merge branch 'pr/34' into dev 8 years ago
GeekQu 97140bf279 fixed bug 8 years ago
GeekQu f016cb66d2 文档中心控制
- 开启或关闭文档中心
- 可选从本地加载文档
- php xcat 新增下载使用文档至本地,请执行 php xcat initdocuments
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
SakuraSa233 7a9be73a38
feat: rename ".config.php.example" to ".config.example.php" 8 years ago
Anankke 7956597953 remove tmt 8 years ago
Anankke 68c11d279c
Merge pull request #651 from topjohncian/dev
增加节点掉线后推送至Server酱
8 years ago
Anankke d19dc0b5a2 remove yft 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
Anankke 111c8eaf74 修缩进 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
Rico 8b1cd924b7
Merge pull request #30 from Anankke/dev
update
8 years ago
CGDF 2ca54f5826 修复update BUG 8 years ago
GeekQu bc652297cf
修正误写 8 years ago
GeekQu 1dcbbf54e9 Merge branch 'pr/29' into dev 8 years ago
CGDF 4ac418785b 初步对接discord bot(debug) 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
GeekQu 205076f62f Merge branch 'pr/20' into dev 8 years ago
Rico a75f665923
Merge pull request #23 from Anankke/dev
update
8 years ago
GeekQu 9d3790d705 Merge branch 'pr/19' into dev 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
Sukka b23a440e9a
Fix: remove useless code 8 years ago
Sukka 34f0d906dc
Feat: using pre decoded qqwry.dat 8 years ago
CGDF 83d941ab66 xcat update不再调用npmbuild 8 years ago
GeekQu a705e50003 Merge branch 'pr/17' into dev 8 years ago
CGDF 3a002f7ddf 全量备份选项 8 years ago
CGDF dcff49155a xcat update包含构建index 8 years ago
CGDF f23d6f3e1e xcat nmpbuild 8 years ago