github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,079 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

7079 Commits (d856f1364afa70e4f31e6fc9013733ce191e9b00)

Author SHA1 Message Date
Michael Bai 74fe9dddb7 fix: 修改i18n 2021-12-09 20:35:52 +08:00
ibuler ade3f3ae6c fix: 修复需要设置 mfa 的 bug 2021-12-09 20:24:02 +08:00
Michael Bai 1c3b574c46 fix: 修复系统用户命令过滤规则必填的问题 2021-12-09 20:23:26 +08:00
Michael Bai 92aeae4a2a fix: 修改i18n 
fix: 修改i18n
 2021-12-09 20:23:07 +08:00
xinwen ea6c28fa0d fix: 修改 cgroup memory log 2021-12-09 20:22:34 +08:00
fit2bot f44acc923b
perf: 修改 otp 的显示，避免误会 (#7345) 
perf: 还是用 OTP 吧

Co-authored-by: ibuler <ibuler@qq.com>
 2021-12-09 19:33:11 +08:00
ibuler f27df2f523 fix: 修复 openstack 同步依赖 2021-12-09 19:28:22 +08:00
Michael Bai bbf2aff96c feat: 命令过滤器支持多维度绑定 
feat: 修改命令过滤规则校验

feat: 修改系统用户命令过滤器迁移文件
 2021-12-09 19:06:28 +08:00
ibuler 3ea4a9fbe6 chore: 修改 html 中 license 文案 2021-12-09 17:33:56 +08:00
fit2bot 3962af7c4f
feat: 支持saml2协议的单点登录，合并代码 (#7347) 
* fix: 支持saml2协议的单点登录

* feat: 支持saml2协议的单点登录，合并代码

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2021-12-09 15:47:21 +08:00
ibuler 38c6d11af1 perf: 修改关闭 issue 的 comment 2021-12-09 15:31:27 +08:00
fit2bot 5f45acf68f
workflow: 修改 workflow (#7341) 
* workflow: 修改 workflow

* fix: 修复判断的错误

* perf: 添加移除的内容

Co-authored-by: ibuler <ibuler@qq.com>
 2021-12-09 12:07:55 +08:00
fit2bot c7f2afc3c1
fix: redis lock bug (#7338) 
Co-authored-by: feng626 <1304903146@qq.com>
 2021-12-08 17:55:32 +08:00
xinwen 16fae00e0e feat: xrdp 远程应用 2021-12-08 15:55:49 +08:00
Eric_Lee 0afeed0ff1
feat: 录像增加 cast 格式 (#7259) 
* feat: 录像增加 cast 格式

* perf: 优化一下写法

* perf: 修改一点点

Co-authored-by: ibuler <ibuler@qq.com>
 2021-12-08 15:35:22 +08:00
Michael Bai d72aa34513 fix: 修改命令过滤规则生成正则表达式的逻辑，提高命令过滤准确性 2021-12-08 10:24:33 +08:00
feng626 d56de16563 fix: 依赖bug 2021-12-07 19:01:14 +08:00
ibuler 8536e6fca7 perf: 添加 issues workflow 2021-12-07 18:29:53 +08:00
feng626 adb9f01231 feat: 密码计划邮件提醒 2021-12-07 17:00:33 +08:00
ibuler e0d4ad8570 workflow: 优化workflow 2021-12-07 10:40:13 +08:00
ibuler 3c8726f1b0 fix: 去掉多余的 collect static 
perf: 使用bash 才能保证 subprocess 运行正常
 2021-12-06 19:03:23 +08:00
ibuler 6b4bc1bdb5 chore: 升级 License 到 GPLv3 
chore: 升级 License 到 GPLv3
 2021-12-06 18:15:17 +08:00
ibuler c92d36391f chore: change license 2021-12-06 17:45:54 +08:00
xinwen 24bbe7c31f fix: 计算docker limit 内存使用率时区分 cgroup v1 v2 2021-12-06 11:22:45 +08:00
fit2bot 77f2bd9262
perf: 优化workflow名称 (#7323) 
* workflow: 添加定时检查issue的workflow

* perf: 优化workflow名称

Co-authored-by: ibuler <ibuler@qq.com>
 2021-12-06 10:09:58 +08:00
ibuler 495a6fbc95 workflow: 添加定时检查issue的workflow 2021-12-03 19:25:56 +08:00
xinwen 36c6299a03 fix: redis 锁在redis集群环境报错 2021-12-03 19:23:44 +08:00
ibuler 8a31fbe35e chore: 添加判断 pull request 2021-12-03 15:22:13 +08:00
ibuler dbe628a8db chore: 添加 issue 备注添加labels 2021-12-03 15:22:13 +08:00
ibuler e45b893662 chore: 添加 workflow 检查issue 2021-12-02 17:50:31 +08:00
feng626 ac4b6e5b96 feat: 工单创建资产添加节点 2021-11-30 16:38:30 +08:00
ibuler c85249be36 perf: 优化订阅处理，形成框架 2021-11-29 15:01:37 +08:00
ibuler de006bc664 perf: 资产添加标签显示，更加易读 
pref: 添加翻译
 2021-11-29 14:57:50 +08:00
xinwen a313e011ef perf: 内存使用率兼顾 docker cgroup limit 2021-11-29 14:53:04 +08:00
Michael Bai 3076b7a5e1 fix: 修复migrations序号重复问题 2021-11-29 11:24:12 +08:00
老广 c47a588e7c
Merge pull request #7289 from jumpserver/pr@dev@merge_with_master 
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
 2021-11-26 11:20:39 +08:00
ibuler 7f61c49db2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 20:00:34 +08:00
ibuler c8a76c9afb fix: 修复 close connection 的问题 2021-11-25 18:29:01 +08:00
ibuler 3e85a9a079 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 18:05:18 +08:00
ibuler 62cbca7eb2 fix: 修复重置 mfa 的提示问题 2021-11-25 17:50:47 +08:00
ibuler 434793bc41 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-25 17:44:51 +08:00
xinwen 85a017b2c4 fix: 按资产ip搜索数据不全 2021-11-25 17:29:47 +08:00
ibuler 84bce19a92 perf: 去掉登录页面更好 2021-11-25 16:02:40 +08:00
ibuler 3874b8ed67 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 
repr@dev_v2.16_v2.15@2ee26971c9b152@fix_xxxx
merges an updated upstream into a topic branch.
 2021-11-25 15:58:33 +08:00
ibuler 7f0ad7e27f fix: 修复 oidc cas 登录时跳转问题 
perf: 优化一波，容易debug

perf: 还原回来的世界
 2021-11-25 15:01:42 +08:00
ibuler 2ee26971c9 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-24 20:41:41 +08:00
ibuler 5ace5a752e fix: 修复 cas/oidc 登录 MFA 产生的bug 
perf: 优化更严谨
 2021-11-24 19:05:15 +08:00
Michael Bai e838d974c3 fix: 修复根据节点/资产查询授权时报错的问题 2021-11-24 19:04:42 +08:00
ibuler 9dd93ea3b8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2021-11-24 16:15:57 +08:00
jiangweidong 88ea7ae149 feat: 云管同步中心支持OpenStack资产同步，所需python库依赖 2021-11-24 14:28:11 +08:00