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 |
Bai
|
2b5bd558f3
|
perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法;
|
2022-12-04 00:04:39 +08:00 |
Eric
|
6480b916d6
|
perf: parse ssh private key
|
2022-12-03 15:25:04 +08:00 |
ibuler
|
289ecbcc75
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-02 20:33:56 +08:00 |
ibuler
|
2cf3a21d27
|
perf: 修改校验权限
|
2022-12-02 20:33:32 +08:00 |
fit2bot
|
156a6c9dc5
|
perf: gateway test connective (#9152)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-02 20:28:49 +08:00 |
ibuler
|
052a4afef6
|
pref: 暂时修改 key fingerprint
|
2022-12-02 20:06:56 +08:00 |
ibuler
|
fbea1f3480
|
perf: 修改一些拼写
|
2022-12-02 19:56:13 +08:00 |
Bai
|
a70f85e346
|
fix: 修改 ConnectionToken Serializer
|
2022-12-02 18:09:07 +08:00 |
Bai
|
52e8082470
|
fix: 修改 LoginAssetACL 过滤 review
|
2022-12-02 17:52:51 +08:00 |
Bai
|
c832f762a5
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-02 17:48:51 +08:00 |
Bai
|
c8c5aca355
|
fix: 修改 ConnectionToken Serializer 命令过滤器
|
2022-12-02 17:48:44 +08:00 |
jiangweidong
|
aa0dabfd10
|
fix: 删除不用migrations
|
2022-12-02 17:40:00 +08:00 |
fit2bot
|
0e0a9f4654
|
perf: gateway account (#9150)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-02 17:36:55 +08:00 |
Aaron3S
|
2f5e133558
|
perf: 优化celery任务
|
2022-12-02 17:18:11 +08:00 |
Aaron3S
|
6d0545f04f
|
perf: 持续优化作业创建
|
2022-12-02 17:17:05 +08:00 |
老广
|
21f91358cf
|
Merge pull request #9147 from jumpserver/pr@v3@fix_withdraw_acl_unfinished
fix: 删除掉连接方式控制半成品代码
|
2022-12-02 14:57:38 +08:00 |
ibuler
|
6c8d64de4e
|
perf: 修改冲突
|
2022-12-02 13:16:33 +08:00 |
ibuler
|
2d771eedc1
|
perf: 优化用户授权 api
|
2022-12-02 13:15:03 +08:00 |
jiangweidong
|
faf1dedfe2
|
fix: 删除掉连接方式控制半成品代码
|
2022-12-02 13:00:48 +08:00 |
Bai
|
563b9f77a6
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-02 12:41:05 +08:00 |
Bai
|
158d49b230
|
fix: 修复用户授权的资产 API 支持 id 过滤
|
2022-12-02 12:40:29 +08:00 |
ibuler
|
61e6ab20a2
|
perf: 修改 Connect acl
|
2022-12-02 12:27:26 +08:00 |
ibuler
|
6390b9c203
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-02 11:53:45 +08:00 |