ibuler
|
dbee3ed30d
|
feat: connect token 添加 Rdp options
|
2022-12-07 15:09:01 +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 |
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 |
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
|
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 |
ibuler
|
a6aafaec05
|
perf: 修改 command filter
|
2022-12-02 11:53:07 +08:00 |
fit2bot
|
541358978d
|
fix: gateway (#9145)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-02 11:45:05 +08:00 |
ibuler
|
19c3f98e8f
|
pref: 修改 migrations 冲突
|
2022-12-02 11:14:29 +08:00 |
ibuler
|
fdbaa0afe1
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-02 11:12:25 +08:00 |
ibuler
|
a18f544cf8
|
perf: 修改 acl
|
2022-12-02 11:12:14 +08:00 |
老广
|
1165ea817f
|
Merge pull request #9035 from jumpserver/pr@v3@feat_db_automations
[v3] feat: 支持Oracle、MongoDB、SQLServer数据库自动化操作部分功能
|
2022-12-02 10:53:29 +08:00 |
jiangweidong
|
85aad7ba62
|
feat: 解决冲突
|
2022-12-02 10:52:31 +08:00 |
老广
|
017a674f63
|
Merge pull request #9143 from jumpserver/pr@v3@perf_gunicorn
perf: 去掉 gunicorn threads
|
2022-12-02 10:47:16 +08:00 |
吴小白
|
709b6e5b0d
|
perf: 去掉 gunicorn threads
|
2022-12-02 10:45:12 +08:00 |
老广
|
11a786d858
|
Merge pull request #9076 from jumpserver/v3_async_ws
perf: asyncio ws task log
|
2022-12-02 10:44:24 +08:00 |
老广
|
07f2e66546
|
Merge pull request #9138 from jumpserver/pr@dev@fix_csrf_403_error
fix: 增加CSRF_TRUSTED_ORIGINS参数,解决CSRF报错
|
2022-12-02 10:40:55 +08:00 |
老广
|
a6b1052767
|
Merge pull request #9139 from jumpserver/pr@v3@perf_gunicorn
perf: 控制 gunicorn 启动进程
|
2022-12-02 10:40:09 +08:00 |
老广
|
bcf509ab07
|
Merge branch 'v3' into pr@v3@feat_support_clear_private_key
|
2022-12-02 10:35:20 +08:00 |
Eric
|
10e3100d3c
|
fix: LoginAssetACL confirm action
|
2022-12-01 22:09:16 +08:00 |
Bai
|
2401c241f2
|
fix: 修改 random_string 方法,支持只生成随机数字
|
2022-12-01 20:12:51 +08:00 |
ibuler
|
1fb0b0849d
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-01 19:41:42 +08:00 |
ibuler
|
cb3877bbda
|
perf: 修改 acl 添加命令过滤 acl
|
2022-12-01 19:41:18 +08:00 |
feng
|
fa0382fc5e
|
perf: gateway manager
|
2022-12-01 18:22:41 +08:00 |
吴小白
|
2bc47c87d1
|
perf: 修正错误
|
2022-12-01 16:12:10 +08:00 |
ibuler
|
8162a1b17e
|
perf: 优化 gateway
|
2022-12-01 15:21:53 +08:00 |
吴小白
|
7a475fc029
|
perf: 控制 gunicorn 启动进程
|
2022-12-01 14:54:57 +08:00 |
halo
|
269c087bac
|
fix: 增加CSRF_TRUSTED_ORIGINS参数,解决CSRF报错
|
2022-12-01 13:47:25 +08:00 |
fit2bot
|
d1461b33c5
|
perf: gather account mysql (#9136)
Co-authored-by: feng <1304903146@qq.com>
|
2022-12-01 13:12:31 +08:00 |
Bai
|
d5d770e4ac
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-12-01 12:03:08 +08:00 |
Bai
|
b55b755e8e
|
fix: 修复 LoginAssetACL Check API 获取 account_username 失败的问题
|
2022-12-01 12:03:01 +08:00 |
Bai
|
592d79c0f8
|
perf: 合并授权规则用户相关的 API URL,统一使用 /<str:user>/ 格式
|
2022-12-01 12:02:20 +08:00 |
feng
|
26efc42e8b
|
perf: type to assets
|
2022-12-01 10:23:04 +08:00 |
Eric
|
d198dfcba9
|
perf: granted asset add specific field
|
2022-12-01 00:36:02 +08:00 |
Bai
|
a430b0f1a9
|
perf: 优化 Login Asset ACL Serializer reviewers 字段
|
2022-11-30 23:05:20 +08:00 |
Bai
|
3b1c8a2327
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-30 21:13:56 +08:00 |
Bai
|
2aa1d664a6
|
perf: 处理 acl filter 逻辑放到 queryset 中
|
2022-11-30 21:13:50 +08:00 |
feng
|
a0df39ad28
|
fix: 修改connection token 对接client的username
|
2022-11-30 20:38:22 +08:00 |
feng
|
314b63cec8
|
perf: connection token launch command
|
2022-11-30 20:21:23 +08:00 |
fit2bot
|
edae6942ac
|
perf: connection token client add protocol (#9134)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-30 20:02:13 +08:00 |
Eric
|
142348b055
|
perf: 增加资产过滤
|
2022-11-30 18:16:52 +08:00 |
fit2bot
|
4083df07cc
|
perf: audit navigation (#9133)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-30 18:13:15 +08:00 |
Bai
|
d524e9885d
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-30 17:11:43 +08:00 |
Bai
|
2dea891b15
|
perf: 处理 acl 后台 check 逻辑
|
2022-11-30 17:11:36 +08:00 |
ibuler
|
0ffea3855b
|
perf: 修改 connect token api
|
2022-11-30 16:39:27 +08:00 |
ibuler
|
6f02b239db
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-30 16:33:52 +08:00 |
ibuler
|
ed77d05bd8
|
pref: conneect token 支持 su from
|
2022-11-30 16:33:22 +08:00 |
Aaron3S
|
dcbdb0af4d
|
feat: 支持执行目录切换,修改字段显示
|
2022-11-30 16:25:31 +08:00 |
Bai
|
25b9739ce3
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-30 16:24:21 +08:00 |
Bai
|
48d2949404
|
perf: 修改 acl assets name/address
|
2022-11-30 16:21:27 +08:00 |
ibuler
|
307cf97ccb
|
perf: 授权的资产支持过滤
|
2022-11-30 15:39:27 +08:00 |
ibuler
|
21b1dd076a
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-30 15:34:31 +08:00 |
ibuler
|
d46f321f1a
|
perf: 修改连接方式
|
2022-11-30 15:24:32 +08:00 |
Bai
|
99e126f515
|
perf: 修改 Acl accounts serializer
|
2022-11-30 15:08:55 +08:00 |
ibuler
|
0f1e19ba41
|
perf: 修改数据库添加 ssl 字段
|
2022-11-30 11:28:51 +08:00 |
ibuler
|
47c405dee5
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-29 21:50:59 +08:00 |
ibuler
|
4b61790a92
|
fix: 修复 connect token remote app 错误
|
2022-11-29 21:50:48 +08:00 |
ibuler
|
44ee80b05a
|
perf: 去掉 connect token endpoint protocol
|
2022-11-29 21:41:33 +08:00 |
Aaron3S
|
82a8118ca0
|
feat: 增加comment 字段
|
2022-11-29 19:52:48 +08:00 |
Aaron3S
|
d741f14342
|
feat: merge migrations
|
2022-11-29 19:47:45 +08:00 |
Aaron3S
|
e191a197c6
|
feat: 完成剩余流程, 修改部分模型
|
2022-11-29 19:44:42 +08:00 |
feng
|
cc5b37350c
|
perf: domain del nodes
|
2022-11-29 19:37:11 +08:00 |
feng
|
dd207016b2
|
perf: del domain node
|
2022-11-29 19:14:12 +08:00 |
feng
|
52541d1dad
|
perf: push dynamic user
|
2022-11-29 19:05:45 +08:00 |
ibuler
|
6593648554
|
perf: 修改 connect token
|
2022-11-29 18:36:42 +08:00 |
Eric
|
426900145e
|
perf: connect token asset add specific
|
2022-11-29 17:08:22 +08:00 |
fit2bot
|
d849fd52bd
|
perf: domian add node (#9130)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-29 17:01:03 +08:00 |
ibuler
|
3ac952f735
|
perf: 修改 connect token 拉起
|
2022-11-29 15:47:35 +08:00 |
ibuler
|
9412c5d42d
|
perf: 修改 connect token 数据结构
|
2022-11-29 14:45:29 +08:00 |
ibuler
|
0981cd1ed1
|
perf: 修改 Connect token 数据结构
|
2022-11-29 14:42:04 +08:00 |
feng
|
e4edf3be02
|
perf: migrate
|
2022-11-29 09:34:43 +08:00 |
ibuler
|
cb76cad6de
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-28 22:59:17 +08:00 |
ibuler
|
f6bdc7f81c
|
pref: 暂存 客户端连接方式
|
2022-11-28 22:58:43 +08:00 |
feng
|
3052aa759c
|
perf: ticket login asset acl
|
2022-11-28 21:54:20 +08:00 |
fit2bot
|
11636dafd8
|
perf: history account secret perm (#9128)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-28 18:43:58 +08:00 |
ibuler
|
742cac1e90
|
pref: 修改数据库连接方式
|
2022-11-28 17:57:33 +08:00 |
feng
|
d0b9dd457f
|
perf: navigation date metrics
|
2022-11-28 16:12:06 +08:00 |
fit2bot
|
4f718f9b1f
|
perf: account template secret api (#9127)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-28 15:54:16 +08:00 |
Eric
|
3c5b459ab7
|
fix: connect token serializer
|
2022-11-28 15:31:00 +08:00 |
ibuler
|
2c26f96e28
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-28 15:01:50 +08:00 |
ibuler
|
a1d72a1746
|
pref: 修改 connect token 一些 Url
|
2022-11-28 15:01:16 +08:00 |
feng
|
0212e32ab2
|
perf: navigation api
|
2022-11-28 14:53:27 +08:00 |
fit2bot
|
072c44974e
|
perf: navigation page (#9125)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-28 11:47:40 +08:00 |
ibuler
|
211f560400
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-27 18:31:34 +08:00 |
ibuler
|
23f3f903f5
|
perf: 修改 connect token
|
2022-11-27 18:31:28 +08:00 |
Bai
|
61c96baeae
|
fix: 修复获取UserLoginLog对象org失败的问题
|
2022-11-27 14:36:16 +08:00 |
feng
|
7d0c480a13
|
Merge remote-tracking branch 'origin/v3' into v3
|
2022-11-27 12:57:31 +08:00 |
feng
|
eec463774a
|
perf: user login logs
|
2022-11-27 12:53:38 +08:00 |
吴小白
|
392ae18d85
|
feat: 使用 uvicorn 取代 daphne
|
2022-11-27 05:56:53 +08:00 |
feng
|
0b802b1782
|
perf: navigation page
|
2022-11-26 19:20:04 +08:00 |
Bai
|
8a3bc51faa
|
解决 authentication 迁移文件冲突
|
2022-11-26 09:52:04 +08:00 |
Aaron3S
|
2c8f51940a
|
feat: 修改ops api
|
2022-11-26 03:13:57 +08:00 |
ibuler
|
5e503ec5b8
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-25 23:11:28 +08:00 |
ibuler
|
0f35b3dd58
|
pref: 修改 connect token
|
2022-11-25 23:09:55 +08:00 |
Eric
|
608e0c9f26
|
feat: support ed25519 key
|
2022-11-25 18:06:22 +08:00 |
fit2bot
|
276f644794
|
perf: gateway (#9121)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-24 21:21:25 +08:00 |
Bai
|
99f5c02d84
|
perf: 获取用户授权的账号返回 has_username 字段
|
2022-11-24 17:04:27 +08:00 |
Bai
|
4574161009
|
fix: 修复获取授权规则的账号列表为空的问题
|
2022-11-24 16:44:15 +08:00 |
jiangweidong
|
69d8dc4bb3
|
perf: 增加DB_USE_SSL配置和redis配置统一
|
2022-11-24 16:01:26 +08:00 |
jiangweidong
|
2d86c8c843
|
Merge branch 'v3' of http://github.com/jumpserver/jumpserver into pr@v3@feat_support_clear_private_key
|
2022-11-24 15:25:17 +08:00 |
jiangweidong
|
9e41ad0764
|
feat: 支持账号更新界面清空存在的秘钥信息
|
2022-11-24 15:25:09 +08:00 |
Aaron3S
|
d977013dc6
|
Merge remote-tracking branch 'origin/v3' into v3
|
2022-11-24 00:52:45 +08:00 |
Aaron3S
|
fa948f7327
|
feat: job 增加组织限制
|
2022-11-24 00:50:37 +08:00 |
fit2bot
|
d44d475cae
|
perf: gateway (#9115)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-23 18:39:05 +08:00 |
ibuler
|
abfd472a0a
|
perf: 修改 connect token
|
2022-11-23 16:11:17 +08:00 |
ibuler
|
075cadb1ab
|
merge: with remote
|
2022-11-22 21:56:30 +08:00 |
ibuler
|
779161d79a
|
perf: 修改 connection token
|
2022-11-22 21:54:40 +08:00 |
fit2bot
|
1a204618f7
|
[v3] perf: migrate gateway to asset (#8928)
* perf: migrate gateway to asset
* perf: asset discriminate gateway
Co-authored-by: feng626 <1304903146@qq.com>
|
2022-11-22 17:33:09 +08:00 |
feng
|
873b81e639
|
perf: ticket migrate
|
2022-11-22 11:36:48 +08:00 |
Jiangjie.Bai
|
d543c3efe7
|
fix: 修复 favorite-assets Serializer 缺少 protocols 字段的问题
|
2022-11-22 11:05:52 +08:00 |
feng
|
4b26fb3e6e
|
fix: jms upgrade_db bug
|
2022-11-21 19:54:00 +08:00 |
jiangweidong
|
c316ad2dbd
|
perf: 支持sentinel开启ssl
|
2022-11-21 18:27:20 +08:00 |
feng
|
f39a3a34e4
|
perf: change secret ignore secret type
|
2022-11-21 16:23:32 +08:00 |
feng
|
94526e44f1
|
perf: change secret timedelta
|
2022-11-21 15:18:09 +08:00 |
ibuler
|
6d5be66b5e
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-18 19:29:52 +08:00 |
ibuler
|
fc1b6c9db2
|
pref: 修改 endpoint api
|
2022-11-18 19:29:19 +08:00 |
Aaron3S
|
d0de36358c
|
feat: 支持定时任务
|
2022-11-18 18:47:48 +08:00 |
feng
|
c785225ff2
|
fix: es 默认存储500
|
2022-11-18 17:05:15 +08:00 |
Bai
|
0eb550f39b
|
fix: flower db file 持久化存储flower信息
|
2022-11-18 15:36:45 +08:00 |
Bryan
|
264c97888f
|
fix: 修复 channels-redis 库升级导致 ws 查看任务日志失败的问题; 修改 REDIS_LAYERS_HOST 变量; 修改 Channel SSL 配置项;
|
2022-11-18 15:25:27 +08:00 |
fit2bot
|
223814f897
|
perf: migrate (#9098)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-18 11:30:31 +08:00 |
ibuler
|
b1bd57cd76
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-17 20:49:31 +08:00 |
ibuler
|
04ee7ee0e7
|
pref: 后端返回 connect types
|
2022-11-17 20:48:50 +08:00 |
Aaron3S
|
24ed11e2a5
|
feat: 运行job 支持动态参数
|
2022-11-17 20:10:13 +08:00 |
feng
|
49a4ceba85
|
perf: ticket
|
2022-11-17 19:20:54 +08:00 |
feng
|
543d61442c
|
perf: ticket accounts
|
2022-11-17 18:04:38 +08:00 |
Jiangjie.Bai
|
e629e6fb3f
|
fix: i18n
|
2022-11-17 17:40:35 +08:00 |
halo
|
1b99a7e06f
|
fix: 账户备份邮件发送找不到文件bug
|
2022-11-17 17:39:53 +08:00 |
fit2bot
|
71122312cf
|
perf: ticket optimization (#9094)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-17 17:34:52 +08:00 |
Eric
|
30f37d9ebf
|
perf: deployment task log order by date
|
2022-11-17 16:39:49 +08:00 |
Eric
|
ef3654ffa4
|
perf: update applet delopyment task
|
2022-11-17 16:03:26 +08:00 |
fit2bot
|
3a62abf381
|
perf: ticket action (#9090)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-17 15:07:23 +08:00 |
ibuler
|
a42641ca9a
|
fix: 修复 redis 连接导致的 pub sub 错误
|
2022-11-17 14:07:43 +08:00 |
halo
|
90c48d303e
|
fix: celery任务时间字段差8小时问题
|
2022-11-17 14:06:31 +08:00 |
fit2bot
|
73c2155864
|
perf: ticket serializer (#9075)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-17 13:52:10 +08:00 |
jiangweidong
|
949166eaed
|
fix: Redis哨兵切换时导致core和celery组件监听线程异常退出
|
2022-11-17 12:19:35 +08:00 |
ibuler
|
4591b03e17
|
pref: 修改 terminal methods
|
2022-11-17 11:46:35 +08:00 |
Eric
|
8a1a7d9e13
|
fix: remove unused serializer_class
|
2022-11-17 11:04:50 +08:00 |
Aaron3S
|
12816d49f6
|
Merge remote-tracking branch 'origin/v3' into v3
|
2022-11-17 10:50:50 +08:00 |
Aaron3S
|
43fee40c46
|
feat: 作业支持增加参数和执行路径超时时间等
|
2022-11-16 21:06:14 +08:00 |
ibuler
|
e2001d7779
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-16 21:06:08 +08:00 |
ibuler
|
fb653f93db
|
pref: 修改添加 connect methods
|
2022-11-16 21:05:15 +08:00 |
Jiangjie.Bai
|
a2b9a5cee3
|
fix: 修复删除数据库由于端口数量限制导致不能删除的问题
|
2022-11-16 21:04:12 +08:00 |
Jiangjie.Bai
|
9e80b70c12
|
fix: 修改用户前一文件
|
2022-11-16 20:48:56 +08:00 |
jiangweidong
|
2454a07d38
|
feat: 支持具有超级工单权限的用户申请工单可以指定申请人
|
2022-11-16 20:42:46 +08:00 |
Jiangjie.Bai
|
ad7647c0cc
|
fix: 修复第三方用户忘记密码页面的提示,不允许修改
|
2022-11-16 20:40:46 +08:00 |
feng
|
ec462e09e0
|
fix: action
|
2022-11-16 19:35:16 +08:00 |
Jiangjie.Bai
|
21d24ae4bc
|
fix: 修复创建授权规则时不包含actions报错的问题
|
2022-11-16 16:23:39 +08:00 |
Jiangjie.Bai
|
2a8d63e9cd
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-16 15:07:46 +08:00 |
Jiangjie.Bai
|
896b59b1bd
|
fix: 修复获取用户收藏的资产API失败的问题
|
2022-11-16 15:07:35 +08:00 |
Aaron3S
|
e7dde616c0
|
Merge remote-tracking branch 'origin/v3' into v3
|
2022-11-16 15:05:38 +08:00 |
Aaron3S
|
0959b55b53
|
perf: 优化字段名称
|
2022-11-16 15:04:46 +08:00 |
Eric
|
7ac9681f0d
|
perf: asyncio ws task log
|
2022-11-16 14:34:56 +08:00 |
Jiangjie.Bai
|
0dec61368c
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-16 11:29:10 +08:00 |
Jiangjie.Bai
|
e118ed655b
|
perf: 优化授权规则获取用户授权的账号API
|
2022-11-16 11:29:02 +08:00 |
jiangweidong
|
18986bc805
|
perf: 增加clickhouse端口帮助文案及注释
|
2022-11-16 10:53:20 +08:00 |
ibuler
|
e34aa0e084
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-15 19:24:14 +08:00 |
ibuler
|
fd54cbc777
|
fix: action choices
|
2022-11-15 19:23:44 +08:00 |
fit2bot
|
157d81f117
|
fix: 翻译 (#9067)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-15 18:09:06 +08:00 |
Jiangjie.Bai
|
aa9e5d2432
|
fix: merge v3
|
2022-11-15 17:50:48 +08:00 |
Jiangjie.Bai
|
3e31c9ed7f
|
fix: 修改用户授权的资产账号
|
2022-11-15 17:49:28 +08:00 |
fit2bot
|
8558204450
|
perf: 修改工单授权过期时间 (#9065)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-15 17:30:29 +08:00 |
Aaron3S
|
b12f83dbea
|
Merge remote-tracking branch 'origin/v3' into v3
|
2022-11-15 17:22:54 +08:00 |
Aaron3S
|
c63c000b10
|
perf: 优化异步认识显示名称
|
2022-11-15 16:29:40 +08:00 |
ibuler
|
7061ce7c97
|
fix: 修改 user granted asset account
|
2022-11-15 16:29:31 +08:00 |
ibuler
|
ed26c7f575
|
perf: reslove conflict
|
2022-11-15 16:27:56 +08:00 |
ibuler
|
7f0744961d
|
pref: 修改 accounts
|
2022-11-15 16:26:18 +08:00 |
ibuler
|
73290f4ed0
|
pref: 修改 accounts
|
2022-11-15 16:24:53 +08:00 |
Jiangjie.Bai
|
0d3c5dddf9
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-15 16:08:16 +08:00 |
Jiangjie.Bai
|
a5fa5fd262
|
fix: 修改用户授权的资产账号API
|
2022-11-15 16:07:42 +08:00 |
Eric
|
ef637e91b9
|
perf: add host deployment task
|
2022-11-15 16:01:51 +08:00 |
ibuler
|
9d0e2b2872
|
pref: 修改 accounts list url
|
2022-11-15 15:47:32 +08:00 |
ibuler
|
989c338002
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-15 15:27:02 +08:00 |
ibuler
|
8e123304ad
|
pref: 修改 perms accounts
|
2022-11-15 15:26:31 +08:00 |
Jiangjie.Bai
|
582a8e0c52
|
fix: 修改 BitChoicesField to_representation swagger 调用报错的问题
|
2022-11-15 14:59:22 +08:00 |
ibuler
|
22dd9906c7
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-15 10:43:51 +08:00 |
ibuler
|
63b32ae903
|
pref: 修改授权 api,去掉不用的
|
2022-11-15 10:43:21 +08:00 |
Jiangjie.Bai
|
83ef013708
|
fix: 修改 actions bit 从1开始
|
2022-11-14 20:25:54 +08:00 |
Eric
|
d554e92d02
|
perf: add applets deployment
|
2022-11-14 19:01:18 +08:00 |
jiangweidong
|
b6f86e8fb6
|
perf: 优化忘记密码,用户无手机号时无法使用手机号重置密码
|
2022-11-14 18:01:07 +08:00 |
fit2bot
|
7280c6726e
|
fix: 删除用户 record 500 (#9058)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-14 17:00:10 +08:00 |
Jiangjie.Bai
|
6f135c34c1
|
fix: 修复测试邮箱服务器字段为null的问题
|
2022-11-14 16:24:05 +08:00 |
ibuler
|
8e1312e8ce
|
pref: 修改 perm token
|
2022-11-14 14:44:18 +08:00 |
ibuler
|
4f135bc349
|
pref: 添加 perm token
|
2022-11-14 14:03:58 +08:00 |
jiangweidong
|
6411642ced
|
perf: 优化操作日志一些内容
|
2022-11-14 09:50:42 +08:00 |
jiangweidong
|
791b175465
|
perf: 优化找回密码页面 (#9045)
* perf: 优化找回密码页面
* perf: 优化找回密码操作页面
|
2022-11-14 09:48:55 +08:00 |
jiangweidong
|
d29e8317e5
|
feat: 添加操作日志ES默认的配置信息
|
2022-11-14 09:40:12 +08:00 |
jiangweidong
|
a868751edd
|
perf: 补充reids ssl配置项
|
2022-11-14 09:40:12 +08:00 |
jiangweidong
|
e03f49e52b
|
perf: 添加Redis哨兵配置的默认值
|
2022-11-14 09:40:12 +08:00 |
Aaron3S
|
0044f11262
|
feat: 执行adhoc和playbook
|
2022-11-11 19:20:17 +08:00 |
fit2bot
|
b100bbf838
|
perf: change secret (#9048)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-11 19:15:43 +08:00 |
Eric
|
8b351f49e5
|
perf: update applet host deployment
|
2022-11-11 18:16:11 +08:00 |
ibuler
|
3abf2592d1
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-11-11 17:29:03 +08:00 |
ibuler
|
9c5b3a03c6
|
pref: 优化 permission actionss
|
2022-11-11 17:28:13 +08:00 |
fit2bot
|
cb82b53791
|
perf: automation celery task (#9046)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-11 16:13:16 +08:00 |
ibuler
|
1cd551e692
|
merge: with remote
|
2022-11-11 15:11:10 +08:00 |
ibuler
|
f6e403fd8b
|
pref: 修改 asset permission
|
2022-11-11 15:04:31 +08:00 |
fit2bot
|
cd3c3eeaf2
|
perf: code (#9044)
Co-authored-by: feng <1304903146@qq.com>
|
2022-11-10 19:11:56 +08:00 |
Eric
|
5494d2fd60
|
perf: update applet host deploy
|
2022-11-10 18:20:39 +08:00 |