Jiangjie.Bai
|
79a21bbc08
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-29 20:42:08 +08:00 |
Jiangjie.Bai
|
14f48c459c
|
feat: 授权规则创建
|
2022-09-29 20:41:40 +08:00 |
feng626
|
b2991362f1
|
perf: 查看用户授权
|
2022-09-29 18:01:23 +08:00 |
Jiangjie.Bai
|
76747642c4
|
feat: 删除授权模块中关于系统用户的API
|
2022-09-29 17:38:27 +08:00 |
Jiangjie.Bai
|
fd0ce0d1c6
|
feat: 添加一些注释信息
|
2022-09-29 16:36:28 +08:00 |
Jiangjie.Bai
|
ba3af280d5
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-29 16:18:20 +08:00 |
Jiangjie.Bai
|
4a1aeefb82
|
feat: 完成用户、用户组对于授权账号的API获取
|
2022-09-29 16:18:12 +08:00 |
feng626
|
ec0c334acc
|
perf: account search
|
2022-09-29 14:44:27 +08:00 |
feng626
|
da35e931a2
|
perf: 更新平台username passwd submit selector可为空
|
2022-09-29 14:19:14 +08:00 |
Jiangjie.Bai
|
15c8c035aa
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-28 18:47:44 +08:00 |
Jiangjie.Bai
|
351d3b297d
|
fix: 修复用户授权资产账号API及Model处理逻辑
|
2022-09-28 18:40:33 +08:00 |
ibuler
|
2a9613d90a
|
perf: 修改 asset serializer
|
2022-09-28 12:10:39 +08:00 |
ibuler
|
72b0fb4274
|
perf: 修改 platform 支持设置 ansible
|
2022-09-26 18:03:48 +08:00 |
ibuler
|
00e1dd6996
|
fix: remote gateway filter address
|
2022-09-26 11:01:21 +08:00 |
ibuler
|
6ed3b51928
|
perf: 优化 serailizer 统一到 drf 目录中
|
2022-09-26 10:43:18 +08:00 |
ibuler
|
f223cf43cc
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-23 19:00:09 +08:00 |
ibuler
|
234acd6317
|
perf: 修改 accounts
|
2022-09-23 18:59:19 +08:00 |
Jiangjie.Bai
|
399c6285f8
|
feat: 获取 用户、资产授权的所有账号API, 返回@INPUT、@USER等内部账号
|
2022-09-23 15:59:37 +08:00 |
Jiangjie.Bai
|
65b942ffa4
|
feat: 修改 Permission filter 方法名
|
2022-09-23 14:45:09 +08:00 |
ibuler
|
286d0e4ac1
|
perf: 修改 migrations
|
2022-09-23 10:53:44 +08:00 |
ibuler
|
3a884388cd
|
perf: 修改名称
|
2022-09-23 10:38:28 +08:00 |
ibuler
|
8f31a25fda
|
perf: 优化迁移文件
|
2022-09-23 10:15:07 +08:00 |
ibuler
|
a35e0c5efa
|
perf: 创建内置 platforms
|
2022-09-22 16:39:41 +08:00 |
ibuler
|
68ed3ac1a8
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-22 15:25:12 +08:00 |
ibuler
|
cc859f302a
|
perf: 优化 asset migrations
|
2022-09-22 15:24:32 +08:00 |
feng626
|
33948d614b
|
perf: ip -> address
|
2022-09-22 15:14:55 +08:00 |
ibuler
|
21a60bf55e
|
perf: change cateogory data strucature
|
2022-09-21 20:13:28 +08:00 |
ibuler
|
ea1cb158b5
|
perf: add charset control
|
2022-09-21 19:03:06 +08:00 |
feng626
|
ffdb3f3b83
|
perf: ticket
|
2022-09-21 18:34:51 +08:00 |
ibuler
|
584ce0afe3
|
perf: 修改迁移文件
|
2022-09-21 13:42:12 +08:00 |
ibuler
|
1b0195cb82
|
perf: 修改 asset 结构
|
2022-09-21 11:17:14 +08:00 |
ibuler
|
cf5c50b343
|
perf: 优化平台协议
|
2022-09-20 21:19:05 +08:00 |
ibuler
|
79ce1215f5
|
merge: with remote branch
|
2022-09-20 17:47:40 +08:00 |
ibuler
|
d0999dd1ef
|
perf: 优化平台创建约束
|
2022-09-20 17:33:15 +08:00 |
feng626
|
615f36c6f6
|
perf: 收集账号
|
2022-09-20 16:18:23 +08:00 |
ibuler
|
8c72bab82d
|
perf: 优化 account 结构
|
2022-09-20 13:54:25 +08:00 |
ibuler
|
9e84989bbe
|
merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-19 20:12:23 +08:00 |
ibuler
|
5d48d1ab15
|
perf: stash it
|
2022-09-19 20:11:55 +08:00 |
feng626
|
7b4c2ce97e
|
perf: xpack problem
|
2022-09-19 19:04:57 +08:00 |
feng626
|
108ccf5a8b
|
perf: 账号管理api
|
2022-09-19 17:00:03 +08:00 |
ibuler
|
762d84b5c3
|
merge: with remote
|
2022-09-19 09:59:43 +08:00 |
ibuler
|
fa28bfc659
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-19 09:55:41 +08:00 |
ibuler
|
b50d28ff9c
|
perf: 暂存修改
|
2022-09-19 09:52:09 +08:00 |
ibuler
|
65331e13ac
|
pref: 优化平台
|
2022-09-19 00:07:59 +08:00 |
feng626
|
389094f615
|
perf: 账号备份
|
2022-09-16 17:24:27 +08:00 |
ibuler
|
a86d5c1456
|
perf: 修改 models
|
2022-09-16 11:45:50 +08:00 |
ibuler
|
1d1b252e58
|
perf: 解决冲突
|
2022-09-15 21:23:00 +08:00 |
ibuler
|
9b2acfe4a4
|
perf: 优化平台
|
2022-09-15 21:20:56 +08:00 |
feng626
|
a4d0ef3706
|
perf: verify ansible linux
|
2022-09-15 21:14:14 +08:00 |
feng626
|
139540fafe
|
perf: 修改change password linux ansible yaml
|
2022-09-15 19:53:26 +08:00 |
ibuler
|
e0e14a2fe1
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-15 16:44:29 +08:00 |
ibuler
|
9edd786bb4
|
perf: 修改 platform 表结构
|
2022-09-15 16:22:01 +08:00 |
Jiangjie.Bai
|
572f03d844
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-15 10:47:05 +08:00 |
Jiangjie.Bai
|
d23446016d
|
refactor: 添加授权相关的获取资产账号API、Model method
|
2022-09-15 10:46:57 +08:00 |
ibuler
|
37bbf75f66
|
perf: 修改数据库迁移文件
|
2022-09-14 20:55:14 +08:00 |
ibuler
|
ae189ebdfe
|
perf: 修改 account serializer
|
2022-09-13 21:18:04 +08:00 |
ibuler
|
4fcbdfa3f4
|
perf: 优化 account 添加 name
|
2022-09-13 21:07:20 +08:00 |
ibuler
|
c1ad072736
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-13 16:39:49 +08:00 |
Jiangjie.Bai
|
a2c006f01b
|
perf: 整理用户授权资产的API
|
2022-09-13 15:41:39 +08:00 |
Jiangjie.Bai
|
4a21f86cd1
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-13 14:23:35 +08:00 |
ibuler
|
9a734e7069
|
perf: 修改结构
|
2022-09-13 14:06:25 +08:00 |
ibuler
|
3e794ec41a
|
perf: 修改 serializer
|
2022-09-13 10:41:49 +08:00 |
ibuler
|
6bf7f7cb48
|
perf: 修改 migrations
|
2022-09-09 19:17:25 +08:00 |
ibuler
|
910eaf1228
|
perf: 修改 web 表结构
|
2022-09-09 19:07:45 +08:00 |
ibuler
|
f6fdc258b1
|
perf: 修改 playbook 目录结构
|
2022-09-09 15:47:40 +08:00 |
ibuler
|
894f153638
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-09 11:00:18 +08:00 |
ibuler
|
aed7b32d6c
|
perf: 修改 assets api
|
2022-09-09 11:00:09 +08:00 |
Jiangjie.Bai
|
6f71989553
|
perf: 下一步整理授权模块所有 API 的继承关系
|
2022-09-08 20:46:56 +08:00 |
Jiangjie.Bai
|
da772b572a
|
fix: 授权 API 顺序整理
|
2022-09-08 20:31:57 +08:00 |
ibuler
|
25bded69ab
|
perf: 修改平台和资产
|
2022-09-08 20:31:04 +08:00 |
Jiangjie.Bai
|
ca6b8ee960
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-08 10:43:29 +08:00 |
ibuler
|
706488d293
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-08 10:04:32 +08:00 |
ibuler
|
50cf40eaeb
|
perf: 完美解决 accounts 创建
|
2022-09-07 20:24:48 +08:00 |
ibuler
|
e9bb5223eb
|
perf: 修改 platforms
|
2022-09-07 20:01:04 +08:00 |
feng626
|
b910180a12
|
自动化策略 表
|
2022-09-07 19:49:42 +08:00 |
Jiangjie.Bai
|
746c6e4242
|
fix: 修改资产、授权创建时的小问题
|
2022-09-07 18:33:34 +08:00 |
Jiangjie.Bai
|
f633a50f8e
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-07 17:36:24 +08:00 |
Jiangjie.Bai
|
a27aeca2fd
|
refactor: 修改授权相关Model,Serializer,API结构
|
2022-09-07 17:35:23 +08:00 |
ibuler
|
56abf0da23
|
pref: 修改平台协议配置
|
2022-09-07 17:12:53 +08:00 |
ibuler
|
585ce6b46a
|
perf: 修改表结构
|
2022-09-06 19:57:03 +08:00 |
ibuler
|
984b8dfb28
|
perf: 修改 m2m 日志记录
|
2022-09-06 13:27:47 +08:00 |
ibuler
|
deba0c9057
|
feat: 支持 py3.9
|
2022-09-05 20:25:37 +08:00 |
ibuler
|
0011823789
|
perf: 去掉 pymysql, mysqlclie已支持 m1
|
2022-09-05 20:06:41 +08:00 |
ibuler
|
d9663036f8
|
perf: revert csrf token project
|
2022-09-05 13:07:20 +08:00 |
ibuler
|
305e9bd0ea
|
Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
|
2022-09-05 12:49:49 +08:00 |
ibuler
|
2354650b82
|
perf: 暂时去掉 csrf token
|
2022-09-05 12:47:01 +08:00 |
feng626
|
757e688ab3
|
账号备份优化
|
2022-09-04 16:33:36 +08:00 |
ibuler
|
7ae395f7e8
|
perf: 修改 metadata
|
2022-09-01 21:00:04 +08:00 |
ibuler
|
81219e1e7c
|
pref: 添加各种 field
|
2022-09-01 17:42:48 +08:00 |
ibuler
|
d7d9fe2718
|
perf: 修改 model
|
2022-09-01 14:46:31 +08:00 |
ibuler
|
4947b0d8fd
|
Merge remote-tracking branch 'origin/v3' into v3
|
2022-09-01 10:41:23 +08:00 |
feng626
|
94f898b55d
|
login asset acl
|
2022-09-01 10:37:22 +08:00 |
ibuler
|
2ede152663
|
Merge remote-tracking branch 'origin/v3' into v3
# Conflicts:
# apps/assets/api/platform.py
|
2022-08-31 11:55:30 +08:00 |
feng626
|
60eb385c1e
|
账号过滤
|
2022-08-31 11:42:20 +08:00 |
ibuler
|
728dc43b6c
|
perf: 修改 fields 支持 display choices
|
2022-08-31 10:06:16 +08:00 |
ibuler
|
ffd08eef74
|
Merge remote-tracking branch 'origin/v3' into v3
|
2022-08-30 19:48:10 +08:00 |
feng626
|
d5c13df6be
|
补全资产api
|
2022-08-30 17:29:54 +08:00 |
ibuler
|
8020881e22
|
Merge remote-tracking branch 'origin/v3' into v3
|
2022-08-30 16:09:43 +08:00 |
Jiangjie.Bai
|
f81805f361
|
fix: 删除perms application多余文件
|
2022-08-30 15:43:29 +08:00 |
ibuler
|
9e7435f1c0
|
perf: 解决冲突
|
2022-08-30 14:15:41 +08:00 |