github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,685 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

7685 Commits (4f16c1f92c14e2762178a40699f14fc241ee71f3)

Author SHA1 Message Date
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
广宏伟 4276ddc2cc perf: 修改脚步 2022-09-05 18:50:33 +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
ibuler 5c73cb9b4e perf: 修改 v3 2022-08-30 14:13:33 +08:00
feng626 62f8fac392 修复迁移文件 2022-08-30 14:09:45 +08:00
ibuler b16e8ef1a5 Merge remote-tracking branch 'origin/v3' into v3 
# Conflicts:
#	apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py
#	apps/tickets/migrations/0018_auto_20220728_1125.py
 2022-08-30 14:09:42 +08:00
feng626 28541c48f7 修复迁移文件 2022-08-30 14:00:20 +08:00
ibuler 8921dc9ac3 Merge remote-tracking branch 'origin/v3' into v3 2022-08-30 13:33:08 +08:00
feng626 3ee8cdbe88 修复迁移文件 2022-08-30 12:50:01 +08:00
ibuler 585f0c64cd perf: 修改 v3 2022-08-30 11:56:56 +08:00