github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,798 Commits
72 Branches
249 Tags
112 MiB
Commit Graph

7798 Commits (7087d5a74e182e50f33ea833bbf6b172714957c4)

Author SHA1 Message Date
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
ibuler 951d4e4e0d perf: 合并冲突 2022-08-30 10:07:03 +08:00
ibuler c950508873 Merge remote-tracking branch 'origin/v3' into v3 2022-08-29 20:11:21 +08:00
feng626 794ec39446 修复备份bug 2022-08-29 19:59:00 +08:00
feng626 ca3d2271a8 merge v3 2022-08-29 19:53:04 +08:00
feng626 3e1c832964 账号备份 2022-08-29 19:49:45 +08:00
ibuler f35cef7abb perf: 修改校验方式 2022-08-29 16:19:37 +08:00
ibuler a0b6849ccb perf: 优化 platform 2022-08-29 15:50:25 +08:00
ibuler 5358f35c08 perf: 修改 host info 2022-08-29 10:49:53 +08:00
ibuler b7075b5378 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-08-24 19:34:32 +08:00
ibuler bb6b9e6f6e pref: 修改创建 platform 2022-08-24 19:32:49 +08:00
feng626 d441f04a6c Merge remote-tracking branch 'origin/v3' into v3 2022-08-24 16:39:25 +08:00
feng626 76390d013e 账号模版 2022-08-24 16:36:42 +08:00
ibuler 063c42b94d perf: 修改 terminal session 2022-08-24 16:14:32 +08:00
ibuler dca1388a67 perf: 修改依赖 2022-08-24 14:23:42 +08:00
ibuler cd8adc6d3d perf: 修改 migrations 2022-08-24 10:57:44 +08:00
ibuler 83bd8b600e perf: 添加 __init__.py 2022-08-23 19:26:47 +08:00
ibuler b1c563b309 fix: 修改 perms tasks 引用的 application 2022-08-23 19:15:48 +08:00
ibuler 1e57a0eb1f perf: merge v3 2022-08-23 10:26:43 +08:00
ibuler ab46194039 perf: 修改 导入 2022-08-23 10:23:48 +08:00
feng626 97c6e2c0b2 修复migrate bug 2022-08-22 18:48:07 +08:00
ibuler 09607a1885 perf: 修改 perms 2022-08-22 18:32:33 +08:00
ibuler f0c9c2b1ad perf: 添加生成 platform 2022-08-22 15:23:28 +08:00
ibuler 60cb1f8136 fix: 修复默认 gcm key padding 2022-08-22 14:26:11 +08:00
吴小白 5f1b7ff8f9 fix: 修正任务报错 2022-08-22 14:12:11 +08:00
ibuler dd0b8e988c perf: stash it 2022-08-22 13:25:57 +08:00
feng626 a7d193464e 添加 choices 获取 label方法 2022-08-22 11:47:45 +08:00
feng626 fe4df4b179 fix: 修复swagger 2022-08-19 19:01:26 +08:00
feng626 37b150bc04 fix: 表单提交csrftoken问题 2022-08-19 17:22:59 +08:00
吴小白 1432fe1609 fix: 添加 openssh-client 依赖包 2022-08-19 17:13:56 +08:00
Jiangjie.Bai 8ae98887ee
Revert "fix: 修复服务端渲染请求缺少csrf token 问题" (#8780) 
This reverts commit 24a1738e73.
 2022-08-19 14:19:47 +08:00
feng626 24a1738e73 fix: 修复服务端渲染请求缺少csrf token 问题 2022-08-19 10:52:59 +08:00
ibuler 05f913ab18 perf: 修改 platform 2022-08-18 17:58:59 +08:00
ibuler a9bf4eddea perf: 修改 migrations 2022-08-18 13:02:10 +08:00
吴小白 bb4da12366 perf: 更新 pypi 镜像 2022-08-18 12:10:41 +08:00
fit2bot 382112ee33
perf: 批量命令搜索优化 (#8772) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-18 11:48:58 +08:00
ibuler 2c3239e238 perf: 修改数据库 migrations 2022-08-18 11:15:17 +08:00
fit2bot 3e69e6840b
fix: oauth2不属于密码认证 (#8771) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-08-18 10:30:20 +08:00