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

374 Commits (6703ab9a7717b076ff10eb50e6caecff9770be56)

Author SHA1 Message Date
fit2bot 5863e3e008
perf(asset): 资产树，右击增加计算节点数量的菜单，可以让后台去计算 #527 (#5207) 
Co-authored-by: xinwen <coderWen@126.com>
 2020-12-10 17:12:39 +08:00
fit2bot 43b5e97b95
feat(excel): 添加Excel导入/导出 (#5124) 
* refactor(drf_renderer): 添加 ExcelRenderer 支持导出excel文件格式; 优化CSVRenderer, 抽象 BaseRenderer

* perf(renderer): 支持导出资源详情

* refactor(drf_parser): 添加 ExcelParser 支持导入excel文件格式; 优化CSVParser, 抽象 BaseParser

* refactor(drf_parser): 添加 ExcelParser 支持导入excel文件格式; 优化CSVParser, 抽象 BaseParser 2

* perf(renderer): 捕获renderer处理异常

* perf: 添加excel依赖包

* perf(drf): 优化导入导出错误日志

* perf: 添加依赖包 pyexcel-io==0.6.4

* perf: 添加依赖包pyexcel-xlsx==0.6.0

* feat: 修改drf/renderer&parser变量命名

* feat: 修改drf/renderer的bug

* feat: 修改drf/renderer&parser变量命名

Co-authored-by: Bai <bugatti_it@163.com>
 2020-12-07 15:23:05 +08:00
fit2bot 662c9092dc
reactor(dockerfile): 使用debian构建docker (#5169) 
Co-authored-by: ibuler <ibuler@qq.com>
 2020-12-03 19:14:28 +08:00
ibuler bf3056abc4 fix(django3): 修复django3兼容问题 2020-11-20 15:25:37 +08:00
fit2bot 6d39a51c36
[fix]: 兼容django 3 (#5038) 
* chore(django): 修改版本依赖

* [fix]: 兼容django 3

* fix(merge): 去掉不用的JSONField

* fix(requirements): 修改加密库的版本

Co-authored-by: ibuler <ibuler@qq.com>
 2020-11-19 15:50:31 +08:00
fit2bot 9af4d5f76f
fix(crypto): 有时解密失败 (#5003) 
* fix(nodes): 节点默认按 value 排序

* fix(crypto): 有时解密失败

Co-authored-by: xinwen <coderWen@126.com>
 2020-11-16 14:47:27 +08:00
peijianbo 79b5aa68c8 feat(terminal):危险命令告警功能 2020-11-10 18:31:16 +08:00
xinwen e93be8f828 feat(crypto): 支持国密算法 2020-11-05 19:04:50 +08:00
xinwen 231332585d fix(perms): 重建授权树冲突时，响应里加 code 2020-11-03 17:53:49 +08:00
ibuler 4ebb4d1b6d chore: resolve conflict 2020-10-29 19:19:20 +08:00
ibuler ba4e6e9a9f refacter: 重构application 2020-10-29 05:48:01 -05:00
ibuler dd793a4eca perf: 优化日志保存策略 2020-10-29 18:27:36 +08:00
xinwen f7e6c14bc5 fix(assets): 向资产推送系统用户bug 2020-10-28 21:40:40 -05:00
xinwen f6031d6f5d fix(logger): 把 drf 异常放到单独的日志文件中 2020-10-28 21:26:35 -05:00
xinwen e2f540a1f4 fix(assets): 网关的密码不能包含特殊字符 2020-10-28 06:05:53 -05:00
Bai 3ccf32ed48 feat(authentication): 用户重置密码成功后，发送用户重置密码成功邮件 2020-09-29 16:28:14 +08:00
xinwen 6701a1b604 fix(perms): 用户添加到用户组报错 2020-09-27 20:53:34 +08:00
xinwen 28da819735 perf(assets): 优化节点树 
修改树策略，做读优化，写的速度降低
 2020-09-21 10:23:09 +08:00
Bai e4aafc236d fix(command): 修复命令导出选中项问题 2020-09-16 19:36:21 +08:00
Bai 95aa9781c3 fix(command): 修复命令导出选中项会导出全部的问题 2020-09-16 19:02:49 +08:00
Bai ae9bbd2683 fix(common) 修复管理员未设置Email主题前缀导致发送邮件失败的问题 2020-09-02 10:23:44 +08:00
herealways 8227f44058 feat: 添加AES GCM模式为默认的加密方式 2020-09-01 14:48:40 +08:00
fit2bot 9cb5985947
fix(orgs): 创建组织用户不必填 (#4515) 
* fix(role): 更改role的顺序

* fix(tickets): 修复工单邮件跳转地址

* fix(tickets): 修复工单复制链接地址不对

* fix(orgs): 创建组织用户不必填

Co-authored-by: xinwen <coderWen@126.com>
 2020-08-19 21:44:20 +08:00
xinwen 11493b9f3d fix(tickets): 修复申请资产工单不能关闭 2020-08-19 07:42:05 -05:00
xinwen a25da8d479 feat(authentication): 超级管理员密码不能是`admin` 2020-08-05 17:23:58 +08:00
xinwen f6a4253936 feat(ticket): 工单关闭生成 Comment 2020-08-05 11:13:23 +08:00
xinwen c3c5801d2e refactor(orgs): 重构组织与用户关系接口 2020-08-04 11:33:15 +08:00
xinwen 90f03dda62 feat(authentication): 类似腾讯企业邮单点登录功能 2020-07-31 19:37:51 +08:00
xinwen e98235ca27 refactor(serializer): 设置 `BulkSerializerMixin` 的默认 `ListSerializer` 为 `AdaptedBulkListSerializer` 2020-07-29 17:09:48 +08:00
xinwen 1b052a8729 feat(terminal): 终端管理添加批量更新接口 2020-07-29 15:14:50 +08:00
xinwen 34b188bbe7 fix(csv): 修复`JMSCSVParser`调用`serializer`导致循环调用问题 2020-07-29 10:45:41 +08:00
xinwen f8e248f0af feat(ticket): 调整申请资产工单 2020-07-28 19:19:37 +08:00
xinwen de3865fa1d refactor(orgs): 重构组织表结构 2020-07-28 10:16:26 +08:00
Bai 7c12f8f462 merge: Merge to dev from branch master 2020-07-09 14:27:08 +08:00
xinwen 39a75074af [Feature] 添加申请资产工单 2020-07-08 15:09:44 +08:00
xinwen 2b6e818943 [Update] 限制上传CSV文件的大小 2020-06-28 19:02:20 +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 8ad71b6dd9
[Update] Move LOCAL_DYNAMIC_SETTINGS (#4113) 2020-06-16 18:11:23 +08:00
Bai f26f7ca1e7 [Update] 修改parsers，处理dict字段值；解决remote-app csv导入时异常 2020-06-15 16:34:51 +08:00
ibuler 148c7ffb43 fix: 添加注释 2020-06-11 14:10:55 +08:00
ibuler 75be45ce43 feat: 使用新的对称加密方式: aes 2020-06-11 12:10:00 +08:00
ibuler 04eb670ada Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-06-11 11:29:28 +08:00
ibuler 66f3706142 feat: 添加aes fix: 修改时区的bug 2020-06-11 11:28:37 +08:00
xinwen 9ea98bf2b2
[Feature] 添加 会话管理/历史会话/下载 api (#4093) 2020-06-10 17:34:56 +08:00
ibuler 1a6597b572 feat: 修改command filter数据结构 2020-06-10 12:58:18 +08:00
ibuler b1640e5592 fix: 修改common resource api的权限，否则auditor无法使用 2020-06-05 14:43:40 +08:00
xinwen 34c556d375
[Fix] spm (#4082) 2020-06-05 10:42:03 +08:00
ibuler 9c6f118dbd feat: 添加批量命令的relation 2020-06-04 20:00:39 +08:00