github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
6,513 Commits
77 Branches
251 Tags
127 MiB
Commit Graph

6513 Commits (ed408fb739d5e116ccf47c9f7ebf3bb5bfef6fae)

Author SHA1 Message Date
Michael Bai ed408fb739 fix: 修复用户登录失败未记录日志的问题 2021-10-19 15:28:11 +08:00
xinwen d0bf815e9b fix: 翻译 2021-10-15 11:31:53 +08:00
xinwen 1d4ea5dbe2 fix: 修改 oauth 认证提示信息 2021-10-15 11:31:53 +08:00
ibuler b5a92e5344 perf: 优化数据迁移，性能提升50倍 2021-09-27 14:06:10 +08:00
Michael Bai 7dfd24ee2b fix: 修复authbook systemuser字段问题 2021-09-24 20:23:29 +08:00
Michael Bai 33d846433a fix: 修复邮件测试序列类及API 2021-09-24 14:13:29 +08:00
ibuler 77669b0ba1 perf: 修改应用授权树，没有的时候不显示 2021-09-24 14:12:50 +08:00
Michael Bai 3c37c86a8e fix: 修复系统用户和资产/节点关联时资产特权用户更新的问题 2021-09-24 12:48:14 +08:00
Michael Bai 2d43c58524 perf: 修改翻译 2021-09-23 11:14:35 +08:00
feng626 95412d739a perf: 工单评论优化 2021-09-22 15:51:59 +08:00
老广 93b5876469
Merge pull request #6923 from jumpserver/pr@v2.14@fix_tokensmsoptions 
fix: 修复KoKo登录时，未开启SMS服务出现了SMS选项的问题
 2021-09-22 11:23:42 +08:00
Michael Bai da02d1e456 fix: 修复KoKo登录时，未开启SMS服务出现了SMS选项的问题 2021-09-22 03:17:15 +00:00
ibuler 5928b265b7 perf: 登录错误提示颜色 2021-09-18 15:06:36 +08:00
wojiushixiaobai f46c043db5 fix: 添加依赖 2021-09-17 00:07:43 +08:00
wojiushixiaobai cbc1ab411b fix: 添加 pg 依赖包 2021-09-17 00:07:43 +08:00
老广 5e03af7243
Merge pull request #6903 from jumpserver/master 
v2.14.0
 2021-09-16 21:19:38 +08:00
老广 6def113cbd
Merge pull request #6902 from jumpserver/dev 
v2.14.0
 2021-09-16 21:17:25 +08:00
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