github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,251 Commits
97 Branches
262 Tags
144 MiB
Commit Graph

7251 Commits (4b9fb4c79656b0ef78efc809446672c69199897f)

Author SHA1 Message Date
Jiangjie.Bai 4b9fb4c796 fix: 修改 public settings API公告字段类型为 dict 2022-05-27 17:23:49 +08:00
fit2bot c30b024f9c
fix: 修复获取 city 时可能的报错 (#8295) 
Co-authored-by: ibuler <ibuler@qq.com>
 2022-05-24 12:30:48 +08:00
feng626 9c14eb5165 fix: 修复用户更新自己密码 url 不准确问题 2022-05-24 11:15:38 +08:00
ibuler 624f32bc6c fix: 修复 Migrations 错误 2022-05-24 11:01:09 +08:00
Jiangjie.Bai c41fc54380
Merge pull request #8271 from jumpserver/dev 
v2.22.0-rc4
 2022-05-18 20:21:35 +08:00
feng626 c2fbe5c75a fix: 不支持es8 提示 2022-05-18 20:20:54 +08:00
feng626 99e1b2cf92 fix: 不支持es8 提示 2022-05-18 20:14:31 +08:00
Jiangjie.Bai 33090c4cdf
Merge pull request #8268 from jumpserver/dev 
v2.22.0-rc4
 2022-05-18 19:49:11 +08:00
fit2bot c8d7c7c56f
fix: 修复oidc认证不区分大小写 (#8267) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-05-18 18:32:53 +08:00
ibuler aa7540045b feat: 添加 session guard 2022-05-18 14:55:58 +08:00
ibuler e5f4b8000e stash 2022-05-18 14:55:58 +08:00
ibuler 44ffd09924 fix: 修复可能的 decode error 2022-05-18 10:17:15 +08:00
ibuler fe3059c1fd fix: 修复获取密码失败 2022-05-17 23:50:30 +08:00
Jiangjie.Bai b76920a4bf fix: 修改组织资源统计时 org 为None的问题 2022-05-17 22:11:42 +08:00
ibuler b5ac5c5670 perf: domain gateway 也添加 2022-05-17 21:36:40 +08:00
ibuler c3c0f87c01 perf: domain gateway 也添加 2022-05-17 21:32:31 +08:00
Jiangjie.Bai d672122c79
Merge pull request #8260 from jumpserver/dev 
v2.22.0-rc3
 2022-05-17 21:14:05 +08:00
fit2bot 0c71190337
fix: 修改 EncryptedField 字段的 write_only 属性 (#8259) 
* fix: 修改 EncryptedField 字段的 write_only 属性

fix: 修改 EncryptedField 字段的 write_only 属性

* fix: 修改 EncryptedField 字段的 write_only 属性

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-17 21:12:59 +08:00
feng626 14710e9c9e feat: 工单审批人中去除申请人 2022-05-17 20:56:53 +08:00
ibuler 7eec50804c perf: 优化 encrypted field 2022-05-17 20:04:46 +08:00
Jiangjie.Bai 0fc5a33983 fix: 修复企业微信、钉钉、飞书登录跳转问题 2022-05-17 18:57:49 +08:00
fit2bot 07779c5a7a
perf: 工单启用 (#8254) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-17 18:57:04 +08:00
fit2bot d675b1d4fc
fix: k8s token 解密 (#8252) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-05-17 16:53:15 +08:00
Jiangjie.Bai 514fa9cf0a
Merge pull request #8250 from jumpserver/dev 
v2.22.0-rc2
 2022-05-17 15:10:59 +08:00
ibuler 2c73611cb4 fix: 修复公告不显示的问题 2022-05-17 11:30:37 +08:00
ibuler 83571718e9 perf: 修改版本 2022-05-16 20:02:10 +08:00
ibuler 521ec0245b fix: ipdb 版本 2022-05-16 20:02:10 +08:00
jiangweidong e80b6936a2 perf: 兼容AWS上redis[ssl]无证书无法部署的问题 2022-05-16 18:03:47 +08:00
Jiangjie.Bai 2c4f937e0b fix: 解决LDAP同步用户仪表盘总数没有刷新的问题 2022-05-16 17:52:49 +08:00
Jiangjie.Bai 2a5497de14 fix: 修改工单审批文案 2022-05-16 17:52:27 +08:00
feng626 d87dc7cbd6 fix: import ipdb 2022-05-16 17:51:37 +08:00
fit2bot 3b253e276c
perf: 优化翻译 (#8244) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-16 17:50:28 +08:00
feng626 525538e775 fix: 修复密码密钥翻译问题 2022-05-16 17:48:28 +08:00
ibuler 2a8f8dd709 perf: 优化使用两个 ip 库 2022-05-16 15:24:38 +08:00
ibuler 1e6e59d815 perf: 添加 ipdb 2022-05-16 15:24:38 +08:00
ibuler 475678e29b fix: 修复密码 write only 2022-05-16 12:19:52 +08:00
Jiangjie.Bai 7f52675bd3
Merge pull request #8229 from jumpserver/dev 
v2.22.0 rc1
 2022-05-12 17:02:01 +08:00
fit2bot 6409b7deee
feat: Endpoint添加Redis Port (#8225) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2022-05-12 14:47:35 +08:00
ibuler 4f37b2b920 perf: 优化 setting 读取，避免遗漏 2022-05-12 11:52:44 +08:00
fit2bot c692eed3c6
perf: 修改client 版本 (#8223) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-05-12 10:59:19 +08:00
ibuler dab8828b03 perf: 优化 setting 获取 2022-05-11 17:57:33 +08:00
ibuler d692188a34 perf: 修改 i18n 2022-05-11 16:03:26 +08:00
Jiangjie.Bai bc8df72603 fix: 修改创建更新用户的密码字段 2022-05-11 16:02:56 +08:00
Jiangjie.Bai bf466a1ba2 feat: LDAP同步用户支持组织 2022-05-11 11:09:30 +08:00
fit2bot aff5b0035d
perf: 优化加密 (#8206) 
* perf: 优化加密

* perf: 优化加密

* perf: 优化加密传输

Co-authored-by: ibuler <ibuler@qq.com>
 2022-05-10 17:28:10 +08:00
jiangweidong b44fa64994
perf: 企业微信、钉钉工单审批增加拒绝功能 (#8208) 
* perf: 工单直接审批增加拒绝功能

* feat: 翻译

* perf: 修改动作名词

* perf: 修改翻译
 2022-05-10 16:30:25 +08:00
ibuler 094446c548 chore: 去掉一个workflow 2022-05-10 10:37:01 +08:00
jiangweidong 64eda5f28b
perf: 命令存储ES可根据日期动态建立索引 (#8180) 
* perf: 命令存储ES可根据日期动态建立索引

* perf: 优化合并字段

* feat: 修改逻辑
 2022-05-09 16:37:31 +08:00
Jiangjie.Bai ab737ae09b fix: 修复获取类型为null的命令显示不支持的问题 
fix: 修复获取类型为null的命令显示不支持的问题
 2022-05-07 17:56:50 +08:00
jiangweidong 55e04e8e9f feat: 内置AIX系统，根据系统选择算法加密密码 2022-05-07 16:25:03 +08:00