github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
6,769 Commits
68 Branches
249 Tags
110 MiB
Commit Graph

6769 Commits (aaaa87dd608a54ccce5e3be7647cff7cef27d3de)

Author SHA1 Message Date
feng626 d44f90ea3d fix: acl xpack 2021-10-28 17:38:55 +08:00
Jiangjie.Bai 42e9fbf37a
Merge pull request #7103 from jumpserver/dev 
v2.15.0
 2021-10-28 15:31:44 +08:00
ibuler d44656aa10 fix: 修复修改用户信息后，绑定丢失 
perf: 还原提示文案
 2021-10-28 15:29:55 +08:00
feng626 09d4228182
Merge pull request #7102 from jumpserver/pr@dev@ticket_tips 
perf: 工单错误提示优化
 2021-10-28 15:25:42 +08:00
feng626 3ae8da231a perf: 工单错误提示优化 2021-10-28 15:16:52 +08:00
feng626 2e4b6d150a fix: 登录复合浏览器不兼容 2021-10-28 15:02:54 +08:00
Michael Bai 8542d53aff fix: 修复ldap用户导入时字段进行strip 2021-10-28 15:02:33 +08:00
Michael Bai 141dafc8bf fix: 创建授权/添加资产到节点；不再自动更新资产的管理用户 2021-10-28 13:39:27 +08:00
Michael Bai 28a6024b49 fix: 修改工单列表默认按照创建日志倒叙排序，修改翻译 2021-10-28 13:38:10 +08:00
ibuler 6cf2bc4baf pref: 优化工单验证 2021-10-28 13:37:24 +08:00
xinwen 631f802961 fix: 钉钉报错的时取得字段不对 2021-10-28 13:31:27 +08:00
feng626 0eedda748a perf: acl username unified 2021-10-28 13:31:05 +08:00
Jiangjie.Bai 7183f0d274
Merge pull request #7089 from jumpserver/dev 
v2.15.0-rc3
 2021-10-27 19:24:42 +08:00
feng626 c93ab15351 fix: acl migrate bug 2021-10-27 11:31:16 +08:00
Michael Bai 3fffd667dc fix: 修改系统用户、工单列表排序字段 2021-10-27 11:16:01 +08:00
fit2bot 11fd2afa3a
perf: 优化下载页面 (#7082) 
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
 2021-10-26 17:27:01 +08:00
Michael Bai 1eb59b11da fix: 添加Model的verbose_name属性 2021-10-26 17:22:05 +08:00
feng626 a1e2d4ca57
Merge pull request #7081 from jumpserver/pr@dev@command_record_filter 
fix: 命令记录-导出选择项命令：却导出了所有命令
 2021-10-26 16:54:27 +08:00
feng626 8a413563be fix: 命令记录-导出选择项命令：却导出了所有命令 2021-10-26 16:50:14 +08:00
ibuler 203a01240b perf: 优化dockerfile 2021-10-26 15:48:17 +08:00
Michael Bai 37fef6153a fix: 修改依赖包版本: jumpserver-django-oidc-rp==0.3.7.8 2021-10-26 15:16:24 +08:00
feng626 ba6c49e62b
Merge pull request #7077 from jumpserver/pr@dev@app_account_translate 
fix: 【【账号管理】应用账号导出字段存在英文】
 2021-10-26 13:42:31 +08:00
feng626 da79f8beab fix: 【【账号管理】应用账号导出字段存在英文】 2021-10-26 13:34:59 +08:00
ibuler 3f72c02049 perf: 添加命令org 2021-10-26 11:49:56 +08:00
feng626 380226a7d2 fix: 用户登陆mfa code为空限制 2021-10-26 11:01:12 +08:00
fit2bot f88e5de3c1
perf: 优化用户创建邮件 (#7072) 
* perf: 优化通知中的连接点击

* perf: 优化用户创建邮件

* perf: 优化时间日期

Co-authored-by: ibuler <ibuler@qq.com>
 2021-10-26 10:52:23 +08:00
Michael Bai 7c149fe91b fix: 修复系统用户applications_amount字段只读 2021-10-25 16:25:12 +08:00
Jiangjie.Bai f673fed706
Merge pull request #7068 from jumpserver/dev 
v2.15.0-rc2
 2021-10-25 15:07:25 +08:00
Michael Bai 84326cc999 fix: 系统用户列表添加 应用数量 字段 2021-10-25 15:01:29 +08:00
xinwen 7d56678a8e fix: 修复登录次数出现 0 2021-10-25 14:30:48 +08:00
feng626 25d1b71448 fix: 修复分时登陆bug 2021-10-25 14:26:47 +08:00
feng626 d3920a0cc9
Merge pull request #7065 from jumpserver/pr@dev@ticket_bug 
fix: 修复工单发邮件及授权资产备注信息修改
 2021-10-25 11:32:01 +08:00
feng626 52889cb67a fix: 修复工单发邮件及授权资产备注信息修改 2021-10-25 11:30:37 +08:00
feng626 0b67c7a953 fix: 修复登陆复合acl时 未添加规则bug 2021-10-25 10:49:00 +08:00
ibuler 1f50a2fe33 perf: 优化签名 2021-10-25 10:48:27 +08:00
ibuler cd5094f10d perf: 优化通知中的连接点击 2021-10-25 10:48:03 +08:00
fit2bot c244cf5f43
pref: 修改使用的消息内容 (#7061) 
* perf:  再次优化通知

* pref: 修改使用的消息内容

* perf: 修复url地址

Co-authored-by: ibuler <ibuler@qq.com>
 2021-10-22 20:06:16 +08:00
feng626 a0db2f6ef8
Merge pull request #7059 from jumpserver/pr@dev@ticket_send_message_multiple_times 
fix: 修复工单结束重复发送受理人消息bug
 2021-10-22 16:40:51 +08:00
feng626 ea485c3070 fix: 修复工单结束重复发送受理人消息bug 2021-10-22 16:38:14 +08:00
feng626 705f352cb9
Merge pull request #7057 from jumpserver/pr@dev@acl_bug 
fix: 修复acl 选择时间段为空bug
 2021-10-22 16:12:40 +08:00
feng626 dc13134b7b fix: 修复acl 选择时间段为空bug 2021-10-22 16:09:22 +08:00
Michael Bai 06de6c3575 fix: 修复资产系统用户auth-info获取流程及创建时手动登录方式的校验 2021-10-22 15:19:58 +08:00
ibuler c341d01e5a perf: 修改工单信息 2021-10-21 20:04:27 +08:00
feng626 d1a3d31d3f feat: 客户端协议内容添加rdp文件名 2021-10-21 19:16:04 +08:00
ibuler 10f4ff4eec fix: 修复工单通知内容bug 2021-10-21 18:36:29 +08:00
ibuler 25ea3ba01d perf: 修改sdk位置 2021-10-21 17:39:28 +08:00
ibuler 072865f3e5 perf: 优化修改 sdk 位置 2021-10-21 17:39:28 +08:00
ibuler d5c9ec1c3d perf: 优化位置 2021-10-21 17:39:28 +08:00
ibuler 487c945d1d perf: 修改代码位置，用户sugestion增加到6个 2021-10-21 17:39:28 +08:00
feng626 a78b2f4b62 fix: 修复工单发消息报错 2021-10-21 17:31:59 +08:00