Bai
|
213221beae
|
perf: 修改BasePermissionViewSet的custom_filter_fields
|
2020-12-11 16:19:18 +08:00 |
Bai
|
2db9c90a74
|
feat: 修改翻译:认证方式
|
2020-12-11 15:49:39 +08:00 |
Bai
|
8ced6f1168
|
fix: 用户ProfileAPI设置is_first_login不是可读写
|
2020-12-11 15:44:17 +08:00 |
Bai
|
6703ab9a77
|
perf: 添加BasePermissionsViewSet,支持搜索过滤
|
2020-12-11 15:44:17 +08:00 |
老广
|
2fc6e6cd54
|
Merge pull request #5213 from jumpserver/dev
chore(merge): 合并dev到master
|
2020-12-10 23:03:35 +08:00 |
Bai
|
2176fd8fac
|
feat: 更新翻译
|
2020-12-10 21:30:56 +08:00 |
fit2bot
|
856e7c16e5
|
feat: 添加组件监控;TerminalModel添加type字段; (#5206)
* feat: 添加组件监控;TerminalModel添加type字段;
* feat: Terminal序列类添加type字段
* feat: Terminal序列类添加type字段为只读
* feat: 修改组件status文案
* feat: 取消上传组件状态序列类count字段
* reactor: 修改termina/models目录结构
* feat: 修改ComponentTypeChoices
* feat: 取消考虑CoreComponent类型
* feat: 修改Terminal status判断逻辑
* feat: 终端列表添加status过滤; 组件状态序列类添加default值
* feat: 添加PrometheusMetricsAPI
* feat: 修改PrometheusMetricsAPI
Co-authored-by: Bai <bugatti_it@163.com>
|
2020-12-10 20:50:22 +08:00 |
fit2bot
|
d4feaf1e08
|
fix: 修复由于更新django captch版本引起的css丢失问题 (#5204)
* fix: 修复由于更新django captch版本引起的css丢失问题
* perf: 优化验证码的高度
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-12-10 20:48:10 +08:00 |
fit2bot
|
5aee2ce3db
|
chore: 升级依赖库版本 (#5205)
* chore: 升级依赖库版本
* fix: 几个库回退几个版本
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-12-10 20:46:45 +08:00 |
xinwen
|
4424c4bde2
|
perf(asset): 手动启动节点资产数量自检程序时区分组织
|
2020-12-10 18:17:01 +08:00 |
fit2bot
|
5863e3e008
|
perf(asset): 资产树,右击增加计算节点数量的菜单,可以让后台去计算 #527 (#5207)
Co-authored-by: xinwen <coderWen@126.com>
|
2020-12-10 17:12:39 +08:00 |
xinwen
|
79a371eb6c
|
perf(auth): 密码过期后,走重置密码流程 #530
|
2020-12-10 16:06:26 +08:00 |
fit2bot
|
7c7de96158
|
feat(login): 登录日志要体现用哪个backend登录的 #4472 (#5199)
Co-authored-by: xinwen <coderWen@126.com>
|
2020-12-09 18:43:13 +08:00 |
ibuler
|
80b03e73f6
|
feat(celery): 添加celery的health check接口
|
2020-12-09 18:06:34 +08:00 |
fit2bot
|
32dbab2e34
|
perf: 数据库应用database字段添加allow_null=True (#5196)
* perf: 数据库应用database字段修改为required
* perf: 数据库应用database字段添加allow_null=True
Co-authored-by: Bai <bugatti_it@163.com>
|
2020-12-09 13:44:07 +08:00 |
ibuler
|
b189e363cc
|
revert(system): 暂时去掉system组件
|
2020-12-09 11:24:44 +08:00 |
Bai
|
4c3a655239
|
perf: 用户序列类禁止修改source字段
|
2020-12-08 20:54:33 +08:00 |
Bai
|
5533114db5
|
feat: 用户授权应用树按组织节点进行区分
|
2020-12-08 20:37:07 +08:00 |
Jiangjie.Bai
|
4c469afa95
|
feat: 取消资产配置相关字段只读模式 (#5182)
* feat: 取消资产配置相关字段只读模式
* feat: 取消资产配置相关字段只读模式
|
2020-12-08 20:32:48 +08:00 |
fit2bot
|
2ccc5beeda
|
perf(Dockerfile): 不再使用zh_CN.UTF-8, en_US.UTF-8 应该也是可以的 (#5190)
* perf(Dockerfile): 不再使用zh_CN.UTF-8, en_US.UTF-8 应该也是可以的
* fix: 还原回原来的LANG设置
* perf: 合并层数
* feat: 修改Dockerfile
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
|
2020-12-08 20:22:48 +08:00 |
xinwen
|
4b67d6925e
|
feat(asset): api 添加推送系统用户到多个资产
|
2020-12-08 18:08:44 +08:00 |
fit2bot
|
dd979f582a
|
stash (#5178)
* Dev (#4791)
* fix(xpack): 修复last login太长的问题 (#4786)
Co-authored-by: ibuler <ibuler@qq.com>
* perf: 更新密码中也发送邮件 (#4789)
Co-authored-by: ibuler <ibuler@qq.com>
* fix(terminal): 修复获取螺旋的异步api
* fix(terminal): 修复有的录像存储有问题的导致下载录像的bug
* fix(orgs): 修复组织添加用户bug
* perf(requirements): 修改jms-storage==0.0.34 (#4797)
Co-authored-by: Bai <bugatti_it@163.com>
Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
* stash
* feat(system): 添加系统app
* stash
* fix: 修复一些bug
Co-authored-by: xinwen <coderWen@126.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
|
2020-12-08 14:26:18 +08:00 |
Bai
|
042ea5e137
|
feat: 授权应用树API返回org_name字段
|
2020-12-08 11:01:09 +08:00 |
ibuler
|
2a6f68c7ba
|
revert: 还原原来的jms,自动运行migraionts
|
2020-12-07 19:16:27 +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 |
ibuler
|
619b521ea1
|
fix: 修改语言i18n
|
2020-12-05 13:22:22 +08:00 |
fit2bot
|
3447eeda68
|
fix(applications): 修改attrs不能为null (#5172)
Co-authored-by: Bai <bugatti_it@163.com>
|
2020-12-04 13:10:59 +08:00 |
fit2bot
|
75ef413ea5
|
fix(applications): 修改attrs不能为null (#5171)
Co-authored-by: Bai <bugatti_it@163.com>
|
2020-12-04 10:24:10 +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
|
c8d54b28e2
|
perf: 优化变量命名
|
2020-12-03 14:23:16 +08:00 |
ibuler
|
96cd307d1f
|
perf: 优化entrypoint.sh
|
2020-12-03 14:23:16 +08:00 |
ibuler
|
6385cb3f86
|
perf: 优化启动,不再自动运行migrations
|
2020-12-03 14:23:16 +08:00 |
Bai
|
36e9d8101a
|
fix: 添加迁移文件: Node ordering
|
2020-12-03 11:16:27 +08:00 |
ibuler
|
3354ab8ce9
|
fix(req): fix wheel version
|
2020-12-03 10:47:21 +08:00 |
Bai
|
89ec6ba6ef
|
fix: Node ordering [`parent_key`, `value`]; 修复默认组织Default节点显示问题(存在key为0的Default节点)
|
2020-12-03 10:45:25 +08:00 |
Bai
|
af40e46a75
|
fix: 优化迁移Default节点
|
2020-12-03 10:29:00 +08:00 |
Bai
|
86fcd3c251
|
fix: 添加迁移文件(如果需要,将Default节点的key从0修改为1)
|
2020-12-03 10:29:00 +08:00 |
fit2bot
|
c2d5928273
|
build(pip): 锁定pip版本 (#5152)
* build(pip): 锁定pip版本
* fix: 锁定pip版本
* fix(req): 锁定加密库版本
* fix(build): 引用pip缓存
Co-authored-by: ibuler <ibuler@qq.com>
|
2020-12-02 11:09:39 +08:00 |
xinwen
|
e656ba70ec
|
fix(assets): 推送动态系统用户未指定 username 取全部 usernames
|
2020-12-01 20:08:54 +08:00 |
xinwen
|
bb807e6251
|
fix(perms): 新建授权时动态用户可能推送不成功
|
2020-12-01 20:08:54 +08:00 |
Bai
|
bbd6cae3d7
|
perf(org): 优化获取org_name字段
|
2020-11-30 15:21:56 +08:00 |
Bai
|
c3b09dd800
|
perf(perms): 优化用户授权树返回org_name字段;添加thread_local属性org_mapper减少查询次数
|
2020-11-30 15:21:56 +08:00 |
Bai
|
6d427b9834
|
fix: 禁止删除组织根节点
|
2020-11-30 14:19:20 +08:00 |
xinwen
|
610aaf5244
|
fix(assets): 动态系统用户和用户关系变化时没有推送到资产
|
2020-11-26 15:20:09 +08:00 |
xinwen
|
df2f1b3e6e
|
perf(User): 用户列表在大规模数据情况下慢
|
2020-11-26 12:32:18 +08:00 |
fit2bot
|
f26b7a470a
|
perf(celery-task): 优化检查节点资产数量的 Celery 任务 (#5052)
Co-authored-by: xinwen <coderWen@126.com>
|
2020-11-25 17:30:07 +08:00 |
xinwen
|
a4667f3312
|
fix(Node): Node 保存的时候,在信号里设置 parent_key
|
2020-11-25 16:35:12 +08:00 |
xinwen
|
91081d9423
|
refactor(perms): 在动态用户所绑定的授权规则中,如授权给用户组,当用户组增加成员后,动态系统用户下没有相应增加用户,因此也不会自动推送 (#5084) (#5086)
|
2020-11-24 19:31:45 +08:00 |
fit2bot
|
3041697edc
|
fix(orgs): 兼容旧的组织用户关系接口 (#5088)
Co-authored-by: xinwen <coderWen@126.com>
|
2020-11-24 19:09:14 +08:00 |
xinwen
|
75d7530ea5
|
fix(perms): 在动态用户所绑定的授权规则中,如授权给用户组,当用户组增加成员后,动态系统用户下没有相应增加用户,因此也不会自动推送
|
2020-11-24 10:27:03 +08:00 |