github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,283 Commits
72 Branches
250 Tags
115 MiB
Commit Graph

8283 Commits (2f3b1d3b666c6f465140fc6c68b6cc8ac2a4b96e)

Author SHA1 Message Date
dependabot[bot] 7bd7be78a4
build(deps): bump django from 3.2.14 to 3.2.15 in /requirements 
Bumps [django](https://github.com/django/django) from 3.2.14 to 3.2.15.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.14...3.2.15)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-06 07:50:20 +00:00
jiangweidong 8e5833aef0 修改一下顺序 2022-09-06 15:49:36 +08:00
jiangweidong f20b465ddf feat: 改密计划支持MongoDB改密 2022-09-06 15:49:36 +08:00
jiangweidong 409d254a2e feat: 支持MFA可配置华为云平台短信对接 2022-09-06 15:48:33 +08:00
halo e6d30fa77d perf: telnet系统工具输出使用utf-8编码 2022-09-06 14:59:16 +08:00
jiangweidong b25404cac1 feat: 支持OAuth2协议自定义注销功能 2022-09-06 14:58:48 +08:00
feng626 ef4cc5f646 perf: 优化账号备份 2022-09-06 14:40:59 +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
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
Jiangjie.Bai f0dc519423 perf: 优化 windows ad帮助链接地址 2022-08-25 15:24:33 +08:00
老广 2cb6da3129
Merge pull request #8811 from jumpserver/pr@dev@perf_customauth 
perf: 优化 custom 认证模块加载逻辑，判断MD5值，启动时只加载一次
 2022-08-25 15:23:08 +08:00
Jiangjie.Bai 1819083a25 perf: 优化 custom 认证模块加载逻辑，判断MD5值，启动时只加载一次 2022-08-25 15:04:45 +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
老广 bdeec0d3cb
Merge pull request #8803 from jumpserver/pr@dev@feat_customauthbackend 
feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；
 2022-08-24 18:44:05 +08:00
Jiangjie.Bai 8fc5c4cf9e feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；通过配置文件控制 2022-08-24 18:41:47 +08:00