github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,279 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

5279 Commits (9ac7759a88915a758fec6b99bdf4955feac82a6a)

Author SHA1 Message Date
github-actions 9ac7759a88 ci(github): 添加通用action 2020-07-21 14:31:35 +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 f0b2d2cdf7 ci(fix): 修改构建脚本 2020-07-09 17:19:21 +08:00
ibuler ed932f6198 ci(build): 修改构建逻辑 2020-07-09 17:19:21 +08:00
ibuler 7c08582e7d Merge branch 'master' into v2.0 2020-07-08 16:14:19 +08:00
ibuler 3555fe1c20 Merge branch 'v2.0' of github.com:jumpserver/jumpserver into v2.0 2020-07-08 16:14:06 +08:00
ibuler 4a1045ba81 ci(build&release): 自动化构建发布 2020-07-08 15:58:57 +08:00
ibuler 7fc3218010 添加example api 2020-07-08 15:58:57 +08:00
ibuler 0dd4c8adc2 Merge branch 'v2.0' of github.com:jumpserver/jumpserver into v2.0 2020-07-08 15:48:05 +08:00
ibuler ce7edc1612 ci(release): 修改 release 使用的tag，而不是自动生成的 2020-07-08 10:36:43 +08:00
ibuler 23ef185b7e fix(build): 修改调用action jumpserver/action-build-upload-asset的参数 2020-07-07 14:30:34 +08:00
ibuler 6b16aa6bc0 ci(build): 修改 构建脚本 
- sed 在不同系统下表现不同
 2020-07-07 13:52:50 +08:00
ibuler 43741dc9b2 ci(build): 修改 workflow 
- 修改使用action jumpserver/action-build-upload-assets
 2020-07-07 13:38:26 +08:00
ibuler 18174e2867 fix(build): 修稿构建 2020-07-07 13:28:59 +08:00
ibuler 3077d11483 ci(release&build): 添加 github workflows, 自动构建 release 
- 添加 utils/build.sh 脚本，构建后放到 release 目录中
- 当 push tags时，自动创建 Release Draft
- 自动生成 Release Change Log
- 自动构建包，上传到 Release Assets
 2020-07-07 13:03:48 +08:00
xinwen a9626c2b39
Merge pull request #4223 from jumpserver/update-add-filter 
[Update] assets/gathered_user 添加过滤字段
 2020-07-01 17:32:58 +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 0d6255b07f
Merge pull request #4218 from jumpserver/system-user-add-filter 
System user add filter
 2020-07-01 15:01:07 +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 1c6f89519a
Merge pull request #4201 from jumpserver/fix-i18n 
Fix i18n
 2020-06-30 14:21:44 +08:00
xinwen 24d093747f [Fix] X-Pack/云管中心 i18n 2020-06-30 14:18:21 +08:00
老广 8c4e9720d3
Merge pull request #4183 from jumpserver/fix_template 
docs(github): 修改 github issue 模板
 2020-06-28 15:22:41 +08:00
ibuler d43709f584 docs(github): 修改 github issue 模板 
更改版本号说明，1.4及之前不再提供支持
 2020-06-28 15:17:15 +08:00
BaiJiangJie 89496baae5
Merge pull request #4148 from jumpserver/v2.0 
V2.0
 2020-06-28 10:47:56 +08:00
BaiJiangJie ea6d995f55
Merge pull request #4147 from jumpserver/v2.0_bugfix_csv 
[Update] 修改csv导出，最大限制条目数从100->10000条
 2020-06-28 10:46:31 +08:00
Bai cf6aba1f38 [Update] 修改csv导出，最大限制条目数从100->10000条 2020-06-28 10:43:47 +08:00
老广 2acc1dc875
Merge pull request #4134 from jumpserver/fix-mfa-1.5 
Fix mfa 1.5
 2020-06-22 19:05:15 +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
老广 e04e31eb30
Merge pull request #4129 from jumpserver/readme 
feat: readme 添加docker pull
 2020-06-22 12:08:28 +08:00
ibuler ff747f9e42 feat: readme 添加docker pull 2020-06-22 12:06:42 +08:00
BaiJiangJie c4bd093fd7
Merge pull request #4126 from jumpserver/v2.0 
V2.0
 2020-06-20 19:26:12 +08:00
BaiJiangJie 408b2d6dbd
Merge pull request #4125 from jumpserver/v2.0_bugfix 
v2.0 添加改密计划安全模式配置项
 2020-06-20 19:24:17 +08:00
BaiJiangJie ebc63b9410
Merge pull request #4123 from jumpserver/v1.5_bugfix 
[Update] 添加改密计划安全模式配置项
 2020-06-20 16:20:53 +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
BaiJiangJie 92fc0ceb16
Merge pull request #4118 from jumpserver/master 
Update readme
 2020-06-18 15:03:32 +08:00