github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-02-22 15:06:13 +00:00
Code Issues Projects Releases Wiki Activity
5,289 Commits 114 Branches 273 Tags
v2.0
Commit Graph

2566 Commits

Author SHA1 Message Date
Bai
79fe39792d fix(common) 修复管理员未设置Email主题前缀导致发送邮件失败的问题 2020-09-02 10:23:18 +08:00
ibuler
514fee1c16 perf(config): 修改默认登录日志保存时间 2020-08-18 05:23:37 -05:00
xinwen
8cbc98f338 fix(csv): 修复JMSCSVParser调用serializer导致循环调用问题 2020-08-13 13:45:01 +08:00
老广
ffea2aef02 Revert "fix(cmd_filter): 命令过滤器唯一应该为 name + org_id (#4326)" 
This reverts commit 550107c456.
 2020-08-13 13:43:41 +08:00
ibuler
85f997b06f fix(auth): 修复radius decode error的问题 2020-08-03 10:32:26 +08:00
Bai
82ee34f746 fix(perms): 修复perms api UserPermissionMixin 中 kwargs 参数传递（未发现引出其他问题） 2020-07-23 11:05:32 +08:00
github-actions
8f2fe13407 fix(cas): 修复cas校验不同的问题 2020-07-22 17:23:27 +08:00
Bai
cfe321163e fix(authentication): 修复用户认证Radius认证中参数传递错误问题 *kwargs -> **kwargs 2020-07-21 10:30:53 +08:00
BaiJiangJie
f89df33601 fix(radius): 修复radius认证失败问题 (#4340) 
* fix(radius): 修复radius认证失败问题，添加get_django_user方法参数（django-radius==1.4.0 中添加了额外参数）

* fix(radius): 修复radius认证失败问题，重写authenticate方法（django-radius 不接受public_key参数)
 2020-07-16 17:08:06 +08:00
xinwen
550107c456 fix(cmd_filter): 命令过滤器唯一应该为 name + org_id (#4326) 2020-07-15 20:03:16 +08:00
xinwen
46ee7c4e04 fix(audits): 操作日志中的动作搜索条件，删除文件字段改成删除 (#4333) 2020-07-15 20:02:13 +08:00
Bai
148a7aa9ee fix(command): 修复命令记录没有根据sesion进行过滤的问题 2020-07-15 17:29:59 +08:00
Bai
dcf9de420e fix(gather_asset_users): 修复收集资产用户日志中用户名显示不完整的问题 2020-07-15 16:23:02 +08:00
xinwen
e94c5daca7 fix(terminal): 移除CommandQueryMixin.get_filter_fields 2020-07-14 19:35:39 +08:00
xinwen
e24abdffba fix(audits): 日志审计模块 Serializer 添加 org_id 字段 2020-07-14 18:05:45 +08:00
Bai
9541a99273 fix(assets): 修复用户name字段长度与资产created_by字段长度不一致导致创建资产失败的问题 2020-07-13 11:32:33 +08:00
ibuler
7c08582e7d Merge branch 'master' into v2.0 2020-07-08 16:14:19 +08:00
xinwen
b265fad50f [Update] assets/gathered_user 添加过滤字段 2020-07-01 17:21:00 +08:00
BaiJiangJie
f40b50dddd Merge pull request #4209 from jumpserver/ftp_log_order 
fix:修改 ftp 日志按开始日期排序
 2020-07-01 15:02:44 +08:00
xinwen
06b02cfcfd [Update] 系统用户添加过滤字段 2020-07-01 14:57:52 +08:00
jym503558564
a7e1ed6f03 fix:修改 ftp 日志按开始日期排序 2020-07-01 11:04:42 +08:00
xinwen
24d093747f [Fix] X-Pack/云管中心 i18n 2020-06-30 14:18:21 +08:00
BaiJiangJie
89496baae5 Merge pull request #4148 from jumpserver/v2.0 
V2.0
 2020-06-28 10:47:56 +08:00
Bai
cf6aba1f38 [Update] 修改csv导出，最大限制条目数从100->10000条 2020-06-28 10:43:47 +08:00
xinwen
32ed43ba7b Merge branch 'v2.0' into fix-mfa-1.5 2020-06-22 19:04:42 +08:00
xinwen
3e993fd044 [Update] 调整MFA绑定策略 V2 2020-06-22 19:02:14 +08:00
xinwen
005573b53b [Fix] 重新绑定 MFA 的漏洞 2020-06-22 18:03:45 +08:00
BaiJiangJie
c4bd093fd7 Merge pull request #4126 from jumpserver/v2.0 
V2.0
 2020-06-20 19:26:12 +08:00
Michael Bai
f1e5c7c2bb 添加改密计划安全模式配置项 2020-06-20 16:18:58 +08:00
Michael Bai
fcb0aefe3c 更改改密计划安全模式配置项名 2020-06-20 15:47:39 +08:00
Bai
29666cc8d3 [Update] 添加改密计划安全模式配置项 2020-06-19 20:41:51 +08:00
xinwen
1d640eccf6 [Fix] /opt/jumpserver/apps/jumpserver/views/index.py redirect(assets:user-asset-list) (#4121) 2020-06-19 18:28:43 +08:00
Bai
64064cb526 [Update] 注释节点树print 2020-06-17 17:47:45 +08:00
Eric_Lee
46941037dd add SECURITY_COMMAND_EXECUTION (#4114) 2020-06-17 15:03:41 +08:00
xinwen
8ad71b6dd9 [Update] Move LOCAL_DYNAMIC_SETTINGS (#4113) 2020-06-16 18:11:23 +08:00
ibuler
220ccda04d fix: 修改domain创建的assets不是必填的 2020-06-16 17:55:18 +08:00
Eric_Lee
6d30fe797c fix ldap test bug (#4110) 2020-06-16 17:25:57 +08:00
xinwen
3318df1771 [Fix] 日志审计/FTP日志 (#4109) 2020-06-16 16:33:53 +08:00
Eric_Lee
0ccd806eca add system user perm api (#4108) 2020-06-16 16:12:59 +08:00
xinwen
7ebe1c2916 [Update] 优化 dynamic settings (#4107) 2020-06-16 15:54:19 +08:00
ibuler
08904c2a9f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-16 15:30:39 +08:00
ibuler
19e34270d1 feat: gather user添加搜索字段 2020-06-16 15:30:25 +08:00
Bai
afa515d570 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev 2020-06-16 15:04:38 +08:00
Bai
bcba408517 [Update] 修改用户source默认local 2020-06-16 15:04:01 +08:00
ibuler
80d94074e7 feat: 修改资产的标签搜索 2020-06-16 14:56:19 +08:00
ibuler
9347405f08 feat: terminal增加搜索 2020-06-16 13:50:21 +08:00
ibuler
da4ad11a69 fix: 修改session command 翻译 2020-06-16 13:39:49 +08:00
ibuler
b81e424e80 fix: 修改翻译 2020-06-16 12:20:16 +08:00
ibuler
1f15937139 feat: 修改翻译，添加settings 2020-06-16 11:04:59 +08:00
Bai
f4fa011714 [Update] 修改mfa校验code无效翻译 2020-06-15 20:31:50 +08:00