github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,106 Commits
86 Branches
259 Tags
135 MiB
Commit Graph

9106 Commits (32f2be2793fd5d27faacd07d44af4bf6faac89c7)

Author SHA1 Message Date
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 fa08517bea
Merge pull request #8868 from jumpserver/dev 
v2.26.0-rc4
 2022-09-15 16:16:51 +08:00
Jiangjie.Bai f86d045c01 fix: 更新翻译 2022-09-15 16:12:12 +08:00
吴小白 1a7fd58abf perf: 修复容器重启页面报错 2022-09-15 15:05: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
Jiangjie.Bai d808256e6a
Merge pull request #8864 from jumpserver/dev 
v2.26.0-rc3
 2022-09-14 20:44:13 +08:00
jiangweidong 305a1b10ed feat: 补充翻译 2022-09-14 20:43:21 +08:00
fit2bot 8c277e8875
fix: 修复mfa失效日期 失效问题 (#8862) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-14 16:17:51 +08:00
dependabot[bot] ca965aca9e
build(deps): bump flower from 1.0.0 to 1.2.0 in /requirements 
Bumps [flower](https://github.com/mher/flower) from 1.0.0 to 1.2.0.
- [Release notes](https://github.com/mher/flower/releases)
- [Commits](https://github.com/mher/flower/compare/v1.0.0...v1.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-13 23:07:48 +00: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
Jiangjie.Bai 061b60ef59
Merge pull request #8858 from jumpserver/dev 
v2.26.0-rc2
 2022-09-13 17:40:13 +08:00
fit2bot c008115888 fix: 修复配置mfa失效日期 失效问题 (#8856) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-13 17:39:09 +08:00
feng626 8d1fb84aaf perf: 工单新增相关过滤 2022-09-13 17:39:09 +08:00
jiangweidong 43d61b5348 feat: 支持对开启SSL/TLS的MongoDb数据库改密 2022-09-13 17:39:09 +08:00
ibuler c26a786287 perf: 优化加密，没有rsa则不加密 2022-09-13 17:39:09 +08:00
fit2bot cb2bd0cf2c fix: 修复账号备份失败问题 (#8852) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-13 17:39:09 +08:00
jiangweidong 3048e6311b fix: 修复华为短信配置错误，前端提示不对的问题 2022-09-13 17:39:09 +08:00
fit2bot 5e16b6387a
fix: 修复配置mfa失效日期 失效问题 (#8856) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-13 17:20:09 +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
feng626 93e1adf376 perf: 工单新增相关过滤 2022-09-13 15:28:46 +08:00
jiangweidong 556bd3682e feat: 支持对开启SSL/TLS的MongoDb数据库改密 2022-09-13 15:27:54 +08:00
ibuler 6bbbe312a2 perf: 优化加密，没有rsa则不加密 2022-09-13 15:27:20 +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
fit2bot 1ac64db0ba
fix: 修复账号备份失败问题 (#8852) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-09-09 16:01:08 +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
jiangweidong fa54a98d6c fix: 修复华为短信配置错误，前端提示不对的问题 2022-09-08 18:55:01 +08:00
Jiangjie.Bai 31de9375e7
Merge pull request #8846 from jumpserver/dev 
v2.26.0-rc1
 2022-09-08 15:43:18 +08:00
halo 697270e3e6 perf: 优化清理任务偶发错误 2022-09-08 15:40:23 +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
halo 56c324b04e perf: utf-8编码忽略报错 2022-09-07 17:50:34 +08:00
Jiangjie.Bai f633a50f8e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-09-07 17:36:24 +08:00