Commit Graph

8394 Commits (ed35ac2930c7baca87c2b48931b8dcee60e0f747)

Author SHA1 Message Date
Jiangjie.Bai a255bd21b4 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-04 18:47:00 +08:00
Jiangjie.Bai 5447ee6c39 feat: 修改获取用户-资产授权的账号列表目录结构; 2022-11-04 18:46:49 +08:00
Jiangjie.Bai 3bba8e4043 fix: 修改翻译文件 2022-11-04 15:50:38 +08:00
Jiangjie.Bai 8abf954015 fix: 处理一波迁移文件 2022-11-04 15:36:45 +08:00
Jiangjie.Bai 1a77dc44cd fix: django.mo 2022-11-04 15:00:58 +08:00
fit2bot 13ae50f5d0
feat: 自定义MFA认证逻辑 (#8891)
* feat: 自定义MFA认证

* feat: 修改翻译信息

Co-authored-by: halo <wuyihuangw@gmail.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
2022-11-04 14:29:15 +08:00
jiangweidong 2029e9f8df
feat: 重构操作日志 (#8941)
* feat:重构操作日志模块

* feat: 改密计划增加操作日志记录

* feat: 支持操作日志接入ES,且接口limit支持自定义限制大小

* feat:翻译

* feat: 生成迁移文件

* feat: 优化迁移文件

* feat: 优化多对多日志记录

* feat: 命令存储ES部分和日志存储ES部分代码优化

* feat: 优化敏感字段脱敏

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
2022-11-04 14:22:38 +08:00
jiangweidong 1e97a23bc5
feat: 忘记密码支持手机短信找回,并修改邮箱方式和手机方式统一 (#8960)
* feat: 忘记密码支持通过手机找回,邮箱方式修改为和手机方式一致

* feat: 翻译

* feat: 修改翻译

* fix: 还原

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
2022-11-04 13:56:55 +08:00
ibuler 037cd90f09 pref: 修改 migrations 2022-11-04 13:29:28 +08:00
ibuler fbf65f437a merge: with merge remote 2022-11-04 11:43:34 +08:00
jiangweidong 262d070f3c feat: 支持纳管 clickhouse[Web Terminal] 2022-11-04 11:41:54 +08:00
ibuler 30106bdbbb perf: 修改组件状态 2022-11-04 11:40:16 +08:00
feng 1981bdd3ac perf: account serializer 2022-11-04 11:39:34 +08:00
feng 8b05bc4b82 perf: 多节点发送文件失败 2022-11-04 11:15:34 +08:00
dependabot[bot] 4ceaba60ed build(deps): bump django from 3.2.15 to 3.2.16 in /requirements
Bumps [django](https://github.com/django/django) from 3.2.15 to 3.2.16.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.15...3.2.16)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-04 11:13:51 +08:00
jiangweidong 40b7331ec0 feat: 支持网域网关应用改密-添加依赖 2022-11-04 11:13:07 +08:00
feng e995e3b35a perf: change secret adjustment 2022-11-04 11:09:56 +08:00
jiangweidong 04cda3da0b feat: 云同步支持金山云 2022-11-04 11:09:02 +08:00
fit2bot ebfc3b7b38
perf: change secret (#9014)
Co-authored-by: feng <1304903146@qq.com>
2022-11-03 22:39:48 +08:00
Eric 7560a5cd1f perf: deploy applet host 2022-11-03 18:03:46 +08:00
Jiangjie.Bai ba1ce5fadb Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-03 16:58:41 +08:00
fit2bot 54f92e100e
perf: account backup (#9013)
Co-authored-by: feng <1304903146@qq.com>
2022-11-03 16:57:34 +08:00
ibuler b0ae9b47ca pref: 修改 applet host 2022-11-03 16:55:38 +08:00
Jiangjie.Bai 340d39d7f7 feat: 添加授权给用户所有账号列表的API 2022-11-03 16:41:51 +08:00
Eric 4bf147a93f perf: add remote app installer 2022-11-03 15:11:20 +08:00
feng 7087d5a74e perf: account specific 2022-11-03 12:42:57 +08:00
feng 0fdc30bed3 perf: account 2022-11-02 20:36:40 +08:00
ibuler 9b3b3d09da Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-02 20:36:28 +08:00
ibuler 0d2bfaa768 pref: 添加 applet host actions 2022-11-02 20:33:27 +08:00
feng 651c7ca152 perf: playbook specific 2022-11-02 19:25:39 +08:00
ibuler cb57ae104b Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-02 19:07:17 +08:00
ibuler 23e44c49b5 pref: 修改 applet deployments 2022-11-02 19:07:07 +08:00
Eric ab6ffda435 perf: terminal status 2022-11-02 19:06:08 +08:00
feng 0c259730ca perf: del surplus code 2022-11-02 17:45:30 +08:00
fit2bot 697b3fb860
perf: 自动化按钮 (#9008)
Co-authored-by: feng <1304903146@qq.com>
2022-11-02 17:27:47 +08:00
ibuler 956367cfed pref: applet detail api 支持 slug name 2022-11-02 15:01:52 +08:00
ibuler f6fe673b28 perf: 修改 applet publications 2022-11-02 14:13:45 +08:00
ibuler c8881d56ea pref: 修改 applets api 2022-11-02 11:08:13 +08:00
ibuler 60d07cb3e1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 20:37:53 +08:00
ibuler 6ba4b750f2 perf: 修改 publications 2022-11-01 20:37:04 +08:00
Jiangjie.Bai 792686d7ae Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 19:55:59 +08:00
Jiangjie.Bai 0728868af2 feat: 添加API获取授权规则授权的所有账号列表 2022-11-01 19:55:49 +08:00
feng 0e5ebfad1c perf: gather asset info and test asset connectivity 2022-11-01 19:37:50 +08:00
Eric 1c9f754e27 perf: applet 添加 setup.yml 校验 2022-11-01 19:06:35 +08:00
ibuler b159f16513 pref: 添加 applet download 2022-11-01 18:40:42 +08:00
jiangweidong 1951c595ed fix: 修改数据类型 2022-11-01 17:07:52 +08:00
jiangweidong c74584f63c fix: Redis Sentinel参数类型问题,导致报错 2022-11-01 17:07:52 +08:00
ibuler 3bacd626e8 pref: 基本完成部署 2022-11-01 17:04:44 +08:00
ibuler 52662252a8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-01 16:19:41 +08:00
ibuler e6d845ae55 fix: 修复空库 migrate 的问题 2022-11-01 16:18:46 +08:00