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

6696 Commits (a313e011ef9afab93b727a5ec754b7b1ed6cad2b)

Author SHA1 Message Date
ibuler 2dc0af2553 perf: 优化 dockerfile 2021-09-16 21:08:04 +08:00
Jiangjie.Bai a291592e59
Merge pull request #6900 from jumpserver/dev 
修改依赖包版本 jumpserver-django-oidc-rp==0.3.7.7
 2021-09-16 20:15:32 +08:00
Michael Bai 6fb4c1e181 修改依赖包版本 jumpserver-django-oidc-rp==0.3.7.7 2021-09-16 19:49:42 +08:00
老广 eee093742c
Merge pull request #6898 from jumpserver/dev 
merge: dev to master
 2021-09-16 19:35:39 +08:00
feng626 743c9bc3f1 fix: 过滤其它类型app 2021-09-16 19:30:32 +08:00
ibuler f963c5ef9d perf: 修改翻译 2021-09-16 19:29:05 +08:00
ibuler 2c46072db2 fix: 修复serializer问题 2021-09-16 19:08:21 +08:00
xinwen b375cd3e75 fix: otp 绑定问题 2021-09-16 19:04:19 +08:00
fit2bot c26ca20ad8
fix: 更新OIDC配置时，将keycloak配置转换为openid (#6893) 
* fix: 修改磁盘使用等key值

* fix: 更新OIDC配置时，将keycloak配置转换为openid

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-09-16 18:57:09 +08:00
Jiangjie.Bai 982a510213
Merge pull request #6892 from jumpserver/ibuler-patch-1 
Update README.md
 2021-09-16 17:46:06 +08:00
老广 5d6880f6e9
Update README.md 2021-09-16 17:45:10 +08:00
xinwen a784a33203 fix: 去掉手动系统用户提示输入密码 2021-09-16 16:47:15 +08:00
xinwen a452f3307f fix: 组件监控的消息 2021-09-16 16:29:56 +08:00
Michael Bai b7a6287925 fix: 修改磁盘使用等key值 2021-09-16 16:29:19 +08:00
feng626 3cba8648cb fix: 工单日期bug 2021-09-16 16:12:42 +08:00
ibuler ef7b2b7980 perf: 优化登录错误提示 2021-09-16 14:07:51 +08:00
xinwen 1ab247ac22 fix: 用户密码过期提醒 2021-09-16 13:43:09 +08:00
Michael Bai ef8a027849 fix: 修改翻译，链接过期 2021-09-16 11:16:21 +08:00
Michael Bai 7890e43f5a fix: 修改网关测试可连接性报错提示信息 2021-09-16 11:00:10 +08:00
fit2bot 2030cbd19d
fix: 修复authbook信号监听；添加翻译文件.mo (#6882) 
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2021-09-16 10:36:24 +08:00
feng626 0f7c8c2570 fix: 工单复核bug 2021-09-16 10:35:19 +08:00
Jiangjie.Bai 9b60d86ddd
Merge pull request #6880 from jumpserver/dev 
v2.14.0 rc3
 2021-09-15 21:05:26 +08:00
ibuler f129f99faa perf: 优化修改获取Hostname 2021-09-15 21:04:56 +08:00
fit2bot 43f30b37da
fix: 用户手机号没有校验 (#6875) 
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2021-09-15 21:00:54 +08:00
xinwen 45aefa6b75 fix: 修改一些翻译 2021-09-15 20:59:50 +08:00
xinwen b30123054b fix: xrdp 手动登录系统用户仍然不需要输入密码 2021-09-15 20:58:56 +08:00
wojiushixiaobai b456e71ec4 perf: 更新 client 链接 2021-09-15 20:57:04 +08:00
xinwen 7560b70c4d feat: 用户详情页面显示 手机号，钉钉，企业微信，飞书 2021-09-15 19:42:24 +08:00
Michael Bai 0c96df5283 fix: 系统用户序列类返回nodes 2021-09-15 19:41:45 +08:00
fit2bot 9dda19b8d7
fix: 修改LDAP同步提示信息 (#6872) 
* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改LDAP同步提示信息

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-09-15 19:16:44 +08:00
fit2bot fbe5f9a63a
fix: 修改资产和特权用户发生变化时，更新资产的admin_user (#6871) 
* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
 2021-09-15 19:11:19 +08:00
xinwen 1c4b4951dc fix: 一些提示 2021-09-15 18:06:57 +08:00
ibuler 8e12399058 perf: 资产序列类优化，改为只读 2021-09-15 18:05:55 +08:00
ibuler 741b96ddee perf: 优化设置中的数字大小 2021-09-15 17:22:23 +08:00
xinwen 8c3f89ee51 fix: 高危命令告警偶发 session 不存在 2021-09-15 17:21:36 +08:00
xinwen dee45ce2e0 fix: 用户离开组织命令复核没有删除 2021-09-15 17:19:37 +08:00
ibuler cfab30f7f7 perf: 修改 i18n 2021-09-15 17:18:17 +08:00
Michael Bai 02e9a96792 fix: 修改翻译 2021-09-15 17:09:48 +08:00
feng626 aa6dcdc65d
Merge pull request #6862 from jumpserver/pr@dev@ticket_time_validation 
fix: 工单失效日期小于开始日期
 2021-09-15 16:44:23 +08:00
feng626 5a6b64eebd fix: 工单失效日期小于开始日期 2021-09-15 16:25:43 +08:00
feng626 2dd7867b32
Merge pull request #6860 from jumpserver/pr@dev@login_confirm 
fix: 登陆复核返回后 删除工单
 2021-09-15 15:42:18 +08:00
feng626 6507f0982c fix: 登陆复核返回后 删除工单 2021-09-15 15:39:34 +08:00
ibuler c115ef7b47 perf: 优化ttl 2021-09-15 15:27:04 +08:00
xinwen bf68ddf09e fix: 腾讯短信检测是否发送成功 2021-09-15 15:26:35 +08:00
xinwen f3906ff998 fix: 用户导出 can_public_key_auth 没翻译 2021-09-15 15:25:52 +08:00
Michael Bai e47ee43631 fix: 修改默认es doc_type 为 _doc 2021-09-15 15:25:09 +08:00
xinwen d22bb2c92f fix: 重置密码连接生成多个token 2021-09-15 11:58:26 +08:00
xinwen 870dac37b9 fix: 重置密码成功的消息里有 br 标签 2021-09-15 11:10:57 +08:00
feng626 d14c5c58ff
Merge pull request #6855 from jumpserver/pr@dev@ticket_notice_bug 
fix: ticket_notice_bug
 2021-09-14 22:33:42 +08:00
feng626 a6b40510d0 fix: ticket_notice_bug 2021-09-14 22:32:13 +08:00