ibuler
|
0d4e346210
|
chore: 修改readme
|
4 years ago |
fit2bot
|
df193162f7
|
chore: 修改readme 英文版本 (#5448)
* chore: 修改readme 英文版本
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
ibuler
|
646f0a568b
|
chore: 修改readme
|
4 years ago |
Jiangjie.Bai
|
be5b4a5f71
|
Merge pull request #5440 from jumpserver/dev
Dev
|
4 years ago |
xinwen
|
e61511372c
|
fix: 修复缓存框架组织切换问题&组织的 resource_statistics 字段是只读
|
4 years ago |
Jiangjie.Bai
|
d4f3280427
|
Merge pull request #5437 from jumpserver/dev
Dev
|
4 years ago |
fit2bot
|
083f061665
|
perf: 更新翻译 (#5438)
* perf: 更新翻译
* perf: 更新翻译
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
be7a93d81a
|
feat: 在登录页面添加CAS/OpenID等第三方登录链接;不再自动跳转登录地址;统一开源/企业版登录页面; (#5389)
* feat: 在登录页面添加CAS/OpenID等第三方登录链接;不再自动跳转登录地址;统一开源/企业版登录页面;
* feat: 登录页面<忘记密码>链接,不限制第三方用户; 在忘记密码页面进行判断与限制
* feat: 登录页面<忘记密码>链接,不限制第三方用户; 在忘记密码页面进行判断与限制 (2)
* fix: 调整样式
Co-authored-by: Bai <bugatti_it@163.com>
Co-authored-by: Orange <orangemtony@gmail.com>
|
4 years ago |
xinwen
|
156be0a64e
|
fix: 网域列表添加默认 name 排序
|
4 years ago |
fit2bot
|
a7fa2331bd
|
feat: 添加缓存模块,添加组织资源统计 (#5407)
* feat: 添加缓存模块,添加组织资源统计
* refactor
* recover .gitkeep
* refactor
* 合并信号处理
* 修复组织添加用户没有发信号
* 修改了一个log级别
Co-authored-by: xinwen <coderWen@126.com>
|
4 years ago |
老广
|
9e0d731a0c
|
Update README.md (#5432)
* Update README.md
* Update README.md
|
4 years ago |
Orange
|
1b184db956
|
Merge pull request #5427 from jumpserver/ibuler-patch-1
Update README.md
|
4 years ago |
老广
|
4b9ed47cda
|
Update README.md
|
4 years ago |
ibuler
|
f04e2fa090
|
fix: bug
|
4 years ago |
Bai
|
83d12d02fb
|
perf: 重构工单处理流程 (7)
|
4 years ago |
ibuler
|
64257823c5
|
pref(common): 优化drf options的filterset 可能引起的问题
|
4 years ago |
fit2bot
|
a7468a243d
|
perf: 重构工单处理流程 (#5408)
* perf: 重构工单处理流程
* perf: 重构工单处理流程 (1)
* perf: 重构工单处理流程 (2)
* perf: 重构工单处理流程 (3)
* perf: 重构工单处理流程 (4)
* perf: 重构工单处理流程 (5)
* perf: 重构工单处理流程 (6)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
528e251f31
|
perf: 日志增加请求耗时 (#5406)
Co-authored-by: Eric <xplzv@126.com>
|
4 years ago |
fit2bot
|
86a055638c
|
reactor: 重构命令&录像存储模块的Serializer及相关模块 (#5392)
* reactor: 重构命令&录像存储模块的Serializer及相关模块
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
b3f359d47b
|
perf(assets): 优化节点生成子节点key生成逻辑 (#5405)
* perf(assets): 优化节点生成子节点key生成逻辑
* perf(assets): 优化写法
* perf(assets): 优化获取子节点的mark
* perf(assets): 再优化一波
* perf(asset): 继续优化这里的写法
Co-authored-by: ibuler <ibuler@qq.com>
|
4 years ago |
Bai
|
dbe969b064
|
perf: 解决MethodSerializer被swagger调用时parent.Serializer会互相影响所需字段显示的问题
|
4 years ago |
Bai
|
b9258878fe
|
fix: 修复celery日志清除问题
|
4 years ago |
Bai
|
19c2973501
|
perf: 可以获取多种协议类型的系统用户列表
|
4 years ago |
ibuler
|
e7a3c5a822
|
perf(api): filter_fields被filterset_fields取代
https://django-filter.readthedocs.io/en/stable/guide/migration.html
|
4 years ago |
老广
|
ff4748f9f4
|
Merge pull request #5385 from jumpserver/pr@dev@feat_asset_task
feat: 添加批量执行资产任务的接口
|
4 years ago |
xinwen
|
60c19148dc
|
feat: 添加批量执行资产任务的接口
|
4 years ago |
老广
|
7eedc0635e
|
Merge pull request #5362 from jumpserver/pr@dev@fix_adhoc_excution
fix: 修复多个 AdHocExecution 在一个 celery task 执行时日志错误
|
4 years ago |
xinwen
|
f5fd40978e
|
fix: 修复多个 AdHocExecution 在一个 celery task 执行时日志错误
|
4 years ago |
Bai
|
72dd23dcce
|
perf: ticket 申请添加 comment
|
4 years ago |
老广
|
5b5c33116a
|
Merge pull request #5350 from hctech/dev
fix:资产自动推送UUIDD数组格式化字符串失败
|
4 years ago |
fit2bot
|
7167515a53
|
feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求 (#5382)
* feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求
* feat: 实现MethodSerializer, 满足serializer中SerializerField动态更改的需求 (2)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
17a01a12db
|
reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能 (#5379)
* reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能
* reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能 (2)
* reactor: 增加DynamicMappingSerializer类,实现Serializer中的字段可以动态改变的功能 (3)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
Bai
|
3188692691
|
perf: 修改swagger问题
|
4 years ago |
Bai
|
aab59403e1
|
perf: 修改工单创建授权规则的字段(created_by)
|
4 years ago |
fit2bot
|
7e7e24f51f
|
reactor&remove: 重构applications模块 & 移除applications、perms中已不再使用的模块 (#5374)
* reactor: 重构applications模块 & 删除applications、perms中已不再使用的模块
* reactor: 1. 针对application.attrs字段的view-serializer映射逻辑,采用DynamicMapping的方案重写;
* reactor: 2. 删除applications和perms模块中已不再使用的database-app/k8s-app/remote-app模块;
* reactor: 添加迁移文件(删除perms/databaseperrmission/remoteapppermission/k8sapppermission)
* reactor: 修改细节
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
fit2bot
|
428e8bf2a0
|
perf: 修改 View dynamic mapping `include dynamic mapping fields Serializer Class` 方案的说明 (#5373)
* perf: 修改 View dynamic mapping `include dynamic mapping fields Serializer Class` 方案的说明
* perf: 修改 View dynamic mapping `include dynamic mapping fields Serializer Class` 方案的说明 (2)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
Bai
|
24b1c87121
|
perf: 修改细节
|
4 years ago |
fit2bot
|
cef93abb2f
|
feat: 抽象View Mapping Serializer架构设计; 重构工单View、Serializer模块 (#5371)
* perf: 优化工单模块(修改迁移文件->Model assignees_display 字段类型为list)
* ignore: try `view` `serializer jsonfields` Map design (1)
* ignore: try `view` `serializer jsonfields` Map design (2)
* ignore: try `view` `serializer jsonfields` Map design (3)
* ignore: try `view` `serializer jsonfields` Map design (4)
* ignore: try `view` `serializer jsonfields` Map design (5)
* ignore: try `view` `serializer.DynamicMappingField` Mapping design (6)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(2)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(3)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(4)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
Bai
|
5c483084b7
|
feat: 优化工单模块
|
4 years ago |
fit2bot
|
167734ca5d
|
feat: 优化工单模块 (#5365)
* feat: 优化工单模块
* feat: 优化工单模块2
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
Bai
|
1a9a5c28f5
|
feat: 优化工单模块1
|
4 years ago |
fit2bot
|
430e20a49c
|
feat: 优化工单模块 (#5361)
* feat: 优化工单模块1
* feat: 优化工单模块2
* feat: 优化工单模块3
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
Jiangjie.Bai
|
3b056ff953
|
reactor&feat: 重构工单模块 & 支持申请应用工单 (#5352)
* reactor: 修改工单Model,添加工单迁移文件
* reactor: 修改工单Model,添加工单迁移文件
* reactor: 重构工单模块
* reactor: 重构工单模块2
* reactor: 重构工单模块3
* reactor: 重构工单模块4
* reactor: 重构工单模块5
* reactor: 重构工单模块6
* reactor: 重构工单模块7
* reactor: 重构工单模块8
* reactor: 重构工单模块9
* reactor: 重构工单模块10
* reactor: 重构工单模块11
* reactor: 重构工单模块12
* reactor: 重构工单模块13
* reactor: 重构工单模块14
* reactor: 重构工单模块15
* reactor: 重构工单模块16
* reactor: 重构工单模块17
* reactor: 重构工单模块18
* reactor: 重构工单模块19
* reactor: 重构工单模块20
* reactor: 重构工单模块21
* reactor: 重构工单模块22
* reactor: 重构工单模块23
* reactor: 重构工单模块24
* reactor: 重构工单模块25
* reactor: 重构工单模块26
* reactor: 重构工单模块27
* reactor: 重构工单模块28
* reactor: 重构工单模块29
* reactor: 重构工单模块30
* reactor: 重构工单模块31
* reactor: 重构工单模块32
* reactor: 重构工单模块33
* reactor: 重构工单模块34
* reactor: 重构工单模块35
* reactor: 重构工单模块36
* reactor: 重构工单模块37
* reactor: 重构工单模块38
* reactor: 重构工单模块39
|
4 years ago |
huangchao
|
795d1b59e0
|
fix:资产自动推送UUIDD数组格式化字符串失败
|
4 years ago |
Bai
|
9d4f1a01fd
|
perf: 升级依赖 python-ldap==3.3.1
|
4 years ago |
xinwen
|
332f65cf2f
|
fix: 将节点的资产添加到系统用户时固定组织
|
4 years ago |
Bai
|
b79e6799c4
|
fix: 修复资产导入携带disk_info信息时失败的问题
|
4 years ago |
Bai
|
4eef425e2a
|
fix: 修复提交系统设置失败的问题
|
4 years ago |
Jiangjie.Bai
|
3f4877f26b
|
Merge pull request #5295 from jumpserver/dev
fix: 修复命令列表过滤字段文案`会话ID`
|
4 years ago |
Bai
|
0e4d778335
|
fix: 修复命令列表过滤字段文案`会话ID`
|
4 years ago |