Commit Graph

8243 Commits (7842e3e5abcb45cacdf793e584ccb49b110391cc)
 

Author SHA1 Message Date
Jiangjie.Bai 7842e3e5ab
Merge: v3 to dev (#9160)
2 years ago
老广 9ef5f17d5e
Merge pull request #9158 from jumpserver/pr@dev@to_v3
2 years ago
ibuler 1e669a7edb perf: 修改 requirements
2 years ago
ibuler daf279304a perf: 修改完冲突了
2 years ago
ibuler 2168610ffe perf: 修改合并引起的 migrations 依赖问题
2 years ago
ibuler e91cbb9c97 merge: with v3
2 years ago
ibuler 873afd239e chore: relove conflict
2 years ago
ibuler 80e550b71a fix: 修复 supertoken 创建
2 years ago
Bai 1a9f520c1f Merge to local v3
2 years ago
Bai cc7424dbfe perf: 修改 CommandFilterACL, CommandGroup Model 的 Meta 内部类; 修改 Command Model 的 system_user -> account 字段; 修改 ConnectionToken 的 command_filter_acls 返回字段;
2 years ago
ibuler ca228074e3 perf: 修改 migrations 依赖
2 years ago
ibuler 0047af4584 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 38b1701b33 perf: 修改 migrations, 修改 Connect token
2 years ago
feng 03e62b5bc1 perf: asset mini
2 years ago
Aaron3S 74b783f62f perf: 合并迁移文件
2 years ago
fit2bot 8a7ecda4f6
perf: asset add automation_enabled_info (#9154)
2 years ago
ibuler d25d580ba4 perf: 合并 connect token
2 years ago
ibuler 669ccb502f perf: 修改 connect token
2 years ago
Bai 0cfcfacb6d perf: 修改 CommandFilterACL, CommandGroup __str__
2 years ago
Bai 519e0eac01 perf: 修改 CommandGroupSerializer type 字段为 LabeledChoiceField
2 years ago
Bai 70fb00c4ee perf: 修改命令过滤ACL序列类和部分翻译
2 years ago
Bai 4d9344eb23 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Bai 229d36abb4 perf: 修改命令过滤 ACL 序列类
2 years ago
Eric 048be1782d fix: replay file data
2 years ago
Bai 5568c4c5df perf: 修改 CommandFilterACL Account 只匹配 username 字段
2 years ago
Bai a69b762f13 fix: 修改 ACL ActionChoices review, accept, reject 引用
2 years ago
Bai 2b5bd558f3 perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法;
2 years ago
Eric 6480b916d6 perf: parse ssh private key
2 years ago
ibuler 289ecbcc75 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 2cf3a21d27 perf: 修改校验权限
2 years ago
fit2bot 156a6c9dc5
perf: gateway test connective (#9152)
2 years ago
ibuler 052a4afef6 pref: 暂时修改 key fingerprint
2 years ago
ibuler fbea1f3480 perf: 修改一些拼写
2 years ago
Bai a70f85e346 fix: 修改 ConnectionToken Serializer
2 years ago
Bai 52e8082470 fix: 修改 LoginAssetACL 过滤 review
2 years ago
Bai c832f762a5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Bai c8c5aca355 fix: 修改 ConnectionToken Serializer 命令过滤器
2 years ago
jiangweidong aa0dabfd10 fix: 删除不用migrations
2 years ago
fit2bot 0e0a9f4654
perf: gateway account (#9150)
2 years ago
Aaron3S 2f5e133558 perf: 优化celery任务
2 years ago
Aaron3S 6d0545f04f perf: 持续优化作业创建
2 years ago
老广 21f91358cf
Merge pull request #9147 from jumpserver/pr@v3@fix_withdraw_acl_unfinished
2 years ago
ibuler 6c8d64de4e perf: 修改冲突
2 years ago
ibuler 2d771eedc1 perf: 优化用户授权 api
2 years ago
jiangweidong faf1dedfe2 fix: 删除掉连接方式控制半成品代码
2 years ago
Bai 563b9f77a6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Bai 158d49b230 fix: 修复用户授权的资产 API 支持 id 过滤
2 years ago
ibuler 61e6ab20a2 perf: 修改 Connect acl
2 years ago
ibuler 6390b9c203 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler a6aafaec05 perf: 修改 command filter
2 years ago