fit2bot
|
e5afbd4118
|
perf: k8s tree api (#9169)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-07 23:55:56 +08:00 |
Aaron3S
|
c14b97419d
|
feat: 增加跳过的主机统计, 增加每台主机执行情况api
|
2022-12-07 20:13:26 +08:00 |
Bai
|
66bdc375df
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-07 19:30:48 +08:00 |
Bai
|
58131a2b68
|
fix: 修复 su-from-accounts API; 前端 Select2 组件初始化时 API 报错的问题;
修改原因:
前端使用 Select2 组件渲染更新账号的表单页面时,会默认先创建 spm 值,
后端调用 get_object 方法时,使用的queryset,就是spm所对应的queryset,
而 detail=True, 查询的值是当前 account_id,不在 queryset 中,
所以会导致调用父类的 get_object 方法报错,对象找不到
|
2022-12-07 19:26:28 +08:00 |
ibuler
|
a27b43107c
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-07 18:59:28 +08:00 |
ibuler
|
0c7de50708
|
perf: 修改 display field
|
2022-12-07 18:58:57 +08:00 |
Bai
|
d252ee41ed
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-07 18:38:12 +08:00 |
Bai
|
6cda28c63d
|
perf: 优化授权规则 user-permission 用户授权相关的 API; 包括 assets, nodes, tree-asset, tree-node, tree-node-with-asset;
|
2022-12-07 18:38:03 +08:00 |
ibuler
|
6a1c5aba12
|
perf: 修改一些翻译
|
2022-12-07 17:24:30 +08:00 |
ibuler
|
02a03e1a28
|
perf: merge i18n
|
2022-12-07 16:02:18 +08:00 |
ibuler
|
da36ce9dfd
|
perf: merge connect token rdp option
|
2022-12-07 15:13:32 +08:00 |
ibuler
|
dbee3ed30d
|
feat: connect token 添加 Rdp options
|
2022-12-07 15:09:01 +08:00 |
jiangweidong
|
e7e3b603a9
|
perf: 清理无用的依赖包
|
2022-12-07 10:53:54 +08:00 |
Bai
|
1cab84bb62
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-06 19:54:15 +08:00 |
Bai
|
bf5da83008
|
perf: 修改授权 API Name
|
2022-12-06 19:53:36 +08:00 |
Aaron3S
|
07b3774d3d
|
feat: 增加运行的内置变量,优化self资源的代码
|
2022-12-06 19:48:31 +08:00 |
Aaron3S
|
d92b198a12
|
perf: 优化ops代码
|
2022-12-06 19:48:28 +08:00 |
Bai
|
6233e2b3de
|
perf: Account su_from 返回使用 ObjectRelatedField allow_null allow_empty
|
2022-12-06 19:41:26 +08:00 |
Bai
|
29fd6ee8c9
|
perf: Account su_from 返回使用 ObjectRelatedField
|
2022-12-06 18:54:13 +08:00 |
Bai
|
c9bf99468c
|
feat: 添加 command-review API
|
2022-12-06 18:27:53 +08:00 |
Bai
|
71e76e5075
|
feat: 添加su-from-accountsAPI
|
2022-12-06 17:43:33 +08:00 |
“huailei000”
|
b6afe77bc0
|
perf: 调整登录页样式
|
2022-12-06 17:43:08 +08:00 |
老广
|
b89720017b
|
Merge pull request #9162 from jumpserver/pr@dev@feat_clickhouse
feat: 增加clickhouse
|
2022-12-06 17:25:24 +08:00 |
jiangweidong
|
803d68f3fe
|
feat: 增加clickhouse
|
2022-12-06 17:13:37 +08:00 |
Jiangjie.Bai
|
7842e3e5ab
|
Merge: v3 to dev (#9160)
* fix: 修改 ConnectionTokenSecretSerializer
* perf: connect token secret (#9155)
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
* feat: 作业迁移至个人级别
* perf: asset enabled (#9157)
Co-authored-by: feng <1304903146@qq.com>
* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法
* perf: ConnectionTokenSecret 返回 domain 信息
* refactor: 移动 Gateway Model 到 asset 目录下
* refactor: 移动 Gateway Model 单独到 gateway 文件中
* perf: 修改 GatewaySerializer 目录
* perf: 修改 GatewaySerializer 目录
Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
|
2022-12-06 11:03:14 +08:00 |
老广
|
9ef5f17d5e
|
Merge pull request #9158 from jumpserver/pr@dev@to_v3
perf: 修改完冲突了
|
2022-12-05 19:47:05 +08:00 |
ibuler
|
1e669a7edb
|
perf: 修改 requirements
|
2022-12-05 19:28:11 +08:00 |
ibuler
|
daf279304a
|
perf: 修改完冲突了
|
2022-12-05 18:54:12 +08:00 |
ibuler
|
2168610ffe
|
perf: 修改合并引起的 migrations 依赖问题
|
2022-12-05 16:07:14 +08:00 |
ibuler
|
e91cbb9c97
|
merge: with v3
|
2022-12-05 15:03:21 +08:00 |
ibuler
|
873afd239e
|
chore: relove conflict
|
2022-12-05 13:41:28 +08:00 |
ibuler
|
80e550b71a
|
fix: 修复 supertoken 创建
|
2022-12-05 13:37:37 +08:00 |
Bai
|
1a9f520c1f
|
Merge to local v3
|
2022-12-05 13:32:33 +08:00 |
Bai
|
cc7424dbfe
|
perf: 修改 CommandFilterACL, CommandGroup Model 的 Meta 内部类; 修改 Command Model 的 system_user -> account 字段; 修改 ConnectionToken 的 command_filter_acls 返回字段;
|
2022-12-05 13:27:51 +08:00 |
ibuler
|
ca228074e3
|
perf: 修改 migrations 依赖
|
2022-12-05 12:58:09 +08:00 |
ibuler
|
0047af4584
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-05 12:42:39 +08:00 |
ibuler
|
38b1701b33
|
perf: 修改 migrations, 修改 Connect token
|
2022-12-05 12:42:15 +08:00 |
feng
|
03e62b5bc1
|
perf: asset mini
|
2022-12-05 11:48:41 +08:00 |
Aaron3S
|
74b783f62f
|
perf: 合并迁移文件
|
2022-12-05 11:26:14 +08:00 |
fit2bot
|
8a7ecda4f6
|
perf: asset add automation_enabled_info (#9154)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-05 11:21:01 +08:00 |
ibuler
|
d25d580ba4
|
perf: 合并 connect token
|
2022-12-05 11:06:50 +08:00 |
ibuler
|
669ccb502f
|
perf: 修改 connect token
|
2022-12-05 10:48:19 +08:00 |
Bai
|
0cfcfacb6d
|
perf: 修改 CommandFilterACL, CommandGroup __str__
|
2022-12-04 22:46:47 +08:00 |
Bai
|
519e0eac01
|
perf: 修改 CommandGroupSerializer type 字段为 LabeledChoiceField
|
2022-12-04 20:51:22 +08:00 |
Bai
|
70fb00c4ee
|
perf: 修改命令过滤ACL序列类和部分翻译
|
2022-12-04 18:48:48 +08:00 |
Bai
|
4d9344eb23
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-04 18:11:32 +08:00 |
Bai
|
229d36abb4
|
perf: 修改命令过滤 ACL 序列类
|
2022-12-04 18:01:35 +08:00 |
Eric
|
048be1782d
|
fix: replay file data
|
2022-12-04 17:39:48 +08:00 |
Bai
|
5568c4c5df
|
perf: 修改 CommandFilterACL Account 只匹配 username 字段
|
2022-12-04 14:44:30 +08:00 |
Bai
|
a69b762f13
|
fix: 修改 ACL ActionChoices review, accept, reject 引用
|
2022-12-04 12:08:44 +08:00 |