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

7779 Commits (52662252a855fabad7a5483c9e07508dad36b34f)

Author SHA1 Message Date
ibuler 0d46834fbf pref: 修改暂存 2022-07-15 18:57:52 +08:00
huangzhiwen 0eaca0c1cb fix: 解决mac m1 pip install pymssql报错问题 2022-07-15 18:06:34 +08:00
fit2cloud 8824b6b54e fix: 解决pip不能安装psycopg2-binary和pymssql问题 2022-07-15 18:06:34 +08:00
ibuler 29c9c6d680 perf: 优化 accounts 2022-07-15 18:03:32 +08:00
fit2bot 4fd82b9946
fix: 修改翻译 (#8602) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-15 17:17:56 +08:00
feng626 1b1b70e7bd fix: 处理应用账号脏数据 2022-07-15 17:03:26 +08:00
Jiangjie.Bai 41541a91b9 fix: 修复 public 和 smart API 权限包含 connection token 2022-07-15 15:01:20 +08:00
fit2bot 93537c07a1
fix: 修复工单授权组织问题 (#8599) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-15 11:38:50 +08:00
Jiangjie.Bai 395636296d fix: 修改连接token secret长度为16 2022-07-14 17:43:57 +08:00
fit2bot 9967d52416
perf: 暂时去掉历史账号权限 (#8594) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-14 15:37:00 +08:00
Jiangjie.Bai dec8e3459a feat: 添加 Oracle 数据库 version 迁移文件默认 12c 版本 
feat: 添加 Oracle 数据库 version 迁移文件默认 12c 版本
 2022-07-14 11:18:26 +08:00
ibuler d3c67d2f04 perf: 暂存一下 2022-07-14 10:56:09 +08:00
fit2bot 4a3d7a8524
perf: history account model queryset (#8588) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 17:13:02 +08:00
fit2bot f758414844
fix: 审批时 来着不同组织的资产校验 (#8586) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 16:54:44 +08:00
dependabot[bot] af080fe38d build(deps): bump django from 3.2.13 to 3.2.14 in /requirements 
Bumps [django](https://github.com/django/django) from 3.2.13 to 3.2.14.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.13...3.2.14)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-13 16:51:22 +08:00
ibuler dac0b44b99 perf: 优化重构 2022-07-13 16:36:49 +08:00
ibuler f0fbc73f73 perf: 工作台支持 root 2022-07-13 16:31:35 +08:00
fit2bot ce2f6fdc84
feat: Endpoint 支持 oracle 版本 (#8585) 
* feat: Endpoint 支持 oracle 版本

* feat: Endpoint 支持 oracle 版本

* feat: Endpoint 支持 oracle 版本

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-07-13 16:29:05 +08:00
fit2bot 2abca39597
fix: ticket bug (#8584) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 15:48:55 +08:00
fit2bot 11e538d417
fix: 工单三方审批不支持修改资产 (#8582) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 11:31:53 +08:00
fit2bot 5155b3c184
fix: 修复bluk_create root 组织下判断 (#8581) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-13 11:00:12 +08:00
feng626 e724cdf53d fix: OrgManager add bulk_create method 2022-07-13 10:47:12 +08:00
halo 191d37dd56 feat: 支持session存储方式可配置，可选cache或db 2022-07-13 10:21:20 +08:00
Jiangjie.Bai 602192696c feat: 添加翻译信息 2022-07-12 18:31:18 +08:00
Jiangjie.Bai b262643f0a fix: 连接令牌添加 expire_time 和 is_valid 字段 2022-07-12 18:29:48 +08:00
fit2bot cd119a2999
fix: 飞书登录登录日志不记录认证方式 (#8574) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-12 17:36:40 +08:00
fit2bot d789810984
fix: condirm (#8572) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-12 16:02:41 +08:00
fit2bot b5cfc6831b
feat: 工单支持审批时修改资产 (#8549) 
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2022-07-12 15:28:42 +08:00
Jiangjie.Bai b64727e04c fix: 修改用户自更新失败的问题 2022-07-12 14:22:07 +08:00
fit2bot c7c0374c78
perf: 修改主题 (#8569) 
* perf: 优化登录 backend

* perf: 修改主题

Co-authored-by: ibuler <ibuler@qq.com>
 2022-07-12 13:45:48 +08:00
ibuler e89765a9ad refactor: 重构系统用户 2022-07-12 10:54:23 +08:00
Jiangjie.Bai f3cf071362 feat: 修改connection token secret不显示 2022-07-11 19:37:55 +08:00
fit2bot 27cbbfbc79
refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑) (#8559) 
* refactor: 重构 Connection Token 模块 (完成 Model 设计和创建 Token 的API逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Token 详细信息的 API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 RDP 文件 API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Client url API 逻辑)

* refactor: 重构 Connection Token 模块 (完成获取 Super connection token API 逻辑)

* refactor: 重构 Connection Token 模块 (完成删除原 Connection token 逻辑)

* refactor: 重构 Connection Token 模块 (完成删除原 Connection)

* refactor: 重构 Connection Token 模块 (完善序列类字段)

* refactor: 重构 Connection Token 模块 (完善expire API)

* refactor: 重构 Connection Token 模块 (完善迁移文件)

* refactor: 重构 Connection Token 模块 (完善翻译文件)

* refactor: 重构 Connection Token 模块 (拆分Connection ViewSet)

* refactor: 重构 Connection Token 模块 (修改翻译)

* refactor: 重构 Connection Token 模块 （优化)

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2022-07-11 18:09:06 +08:00
feng626 7047e445a3 feat: 下载页面添加离线播放器 2022-07-11 17:21:07 +08:00
fit2bot 06375110b9
fix: 修改mfa check 判断 (#8561) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-11 10:48:01 +08:00
Jiangjie.Bai 0e6dbb3e5d fix: 修复 ES 存储 config 被修改的问题 2022-07-08 11:00:22 +08:00
fit2bot bf7c05f753
fix: 调整confirm (#8554) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-07 17:07:57 +08:00
Jiangjie.Bai 1b4d389f2b fix: 修复创建共享会话链接时 created_by 字段长度问题 2022-07-07 15:44:07 +08:00
fit2bot 0f11ca9c37
perf: 修改翻译 (#8543) 
* perf: 修改翻译

* perf: 优化 flash msg page

* perf: 修改 i18n

* perf: 修改 i18n

Co-authored-by: ibuler <ibuler@qq.com>
 2022-07-06 17:26:09 +08:00
ibuler 4537e30e4a perf: 修改颜色 2022-07-05 20:28:42 +08:00
dependabot[bot] 2f71ee71b9 build(deps): bump django from 3.2.12 to 3.2.13 in /requirements 
Bumps [django](https://github.com/django/django) from 3.2.12 to 3.2.13.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.12...3.2.13)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-05 20:28:20 +08:00
ibuler 98644eeb61 perf: 修改 logo 2022-07-05 20:07:24 +08:00
fit2bot 001e5d857f
pref: debug toolbar 太费时间 先禁用 (#8528) 
* perf: 修改主题色

* pref: debug toolbar 太费时间 先禁用

* perf: 修改颜色

* perf: 优化 interface

* perf: 修改 avartar

* perf: css color

Co-authored-by: ibuler <ibuler@qq.com>
 2022-07-05 14:43:56 +08:00
Jiangjie.Bai bbcf992531 feat: 添加 OmniDB Enabled 控制 
feat: 添加 OmniDB Enabled 控制
 2022-07-05 11:12:37 +08:00
fit2bot 75aacd0da6
fix: 用户登录错误处理bug (#8531) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-05 11:08:35 +08:00
fit2bot 0aad0b7279
feat: 账号历史信息 (#8500) 
* feat: 账号历史信息

* del app

Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-04 18:54:47 +08:00
fit2bot 8ebcb4b73a
fix: translate (#8529) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-04 15:14:59 +08:00
fit2bot 88f60b58dd
fix: 修复翻译 (#8527) 
Co-authored-by: feng626 <1304903146@qq.com>
 2022-07-04 14:57:45 +08:00
fit2bot a6cc8a8b05
perf: 优化confirm接口 (#8451) 
* perf: 优化confirm接口

* perf: 修改 校验

* perf: 优化 confirm API 逻辑

* Delete django.po

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2022-07-04 11:29:39 +08:00
halo ca19e45905 perf: 优化截取方法 2022-07-04 11:00:41 +08:00