github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-03-20 03:52:06 +00:00
Code Issues Projects Releases Wiki Activity
12,846 Commits 115 Branches 274 Tags
pr@dev@fix_protocol_error
Commit Graph

601 Commits

Author SHA1 Message Date
feng
408c6c568a perf: account backup 2022-12-12 12:33:45 +08:00
Bai
8beb1b81cf fix: 修改 AssetSerializer 继承 BulkOrgResourceSerializerMixin 序列类 2022-12-09 11:12:56 +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
0c7de50708 perf: 修改 display field 2022-12-07 18:58:57 +08:00
ibuler
6a1c5aba12 perf: 修改一些翻译 2022-12-07 17:24:30 +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
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
e91cbb9c97 merge: with v3 2022-12-05 15:03:21 +08:00
feng
03e62b5bc1 perf: asset mini 2022-12-05 11:48:41 +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
fit2bot
0e0a9f4654 perf: gateway account (#9150) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 17:36:55 +08:00
fit2bot
541358978d fix: gateway (#9145) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 11:45:05 +08:00
老广
bcf509ab07 Merge branch 'v3' into pr@v3@feat_support_clear_private_key 2022-12-02 10:35:20 +08:00
feng
fa0382fc5e perf: gateway manager 2022-12-01 18:22:41 +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
fit2bot
d849fd52bd perf: domian add node (#9130) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-29 17:01:03 +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
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
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
feng
3d6609ec8c perf: gateway 2022-11-23 18:36:42 +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
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
Jiangjie.Bai
896b59b1bd fix: 修复获取用户收藏的资产API失败的问题 2022-11-16 15:07:35 +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
fit2bot
a5cef74356 perf: serializer (#9034) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-09 18:15:21 +08:00
feng
3b4e388ed0 perf: gather account api adjustment 2022-11-09 15:42:21 +08:00
fit2bot
0ff8758ea8 perf: gather account automation api (#9029) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-08 20:33:55 +08:00
ibuler
d040b4cfe0 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-08 19:19:28 +08:00
ibuler
5730265183 pref: 修改 account secret_type 类型 2022-11-08 19:18:04 +08:00
fit2bot
ce9ebd94ec perf: change secret automation api (#9028) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-08 17:54:51 +08:00
feng
b4f511a7ff perf: account backup 2022-11-07 17:01:28 +08:00
fit2bot
1cc983b2eb perf: automation button (#9023) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-07 16:10:26 +08:00
ibuler
045bc3661a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-04 20:16:29 +08:00
ibuler
4405064e78 pref: 添加 api debug timer 2022-11-04 20:14:19 +08:00
fit2bot
dca92a1e04 perf: push account (#9020) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-04 19:18:15 +08:00
feng
1981bdd3ac perf: account serializer 2022-11-04 11:39:34 +08:00
fit2bot
ebfc3b7b38 perf: change secret (#9014) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-03 22:39:48 +08:00
feng
7087d5a74e perf: account specific 2022-11-03 12:42:57 +08:00
fit2bot
697b3fb860 perf: 自动化按钮 (#9008) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-02 17:27:47 +08:00
ibuler
cf81f08b7a perf: 优化部署 host 2022-11-01 11:52:51 +08:00
ibuler
350c9e4a80 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-25 19:38:40 +08:00
ibuler
82aca6b843 pref: 修改 applet 2022-10-25 19:31:13 +08:00