github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
11,463 Commits
87 Branches
259 Tags
138 MiB
Commit Graph

11463 Commits (6108a09089f341c2973b9b545f050e311aaf122a)

Author SHA1 Message Date
ibuler 348f67f4a4 Merge branch 'v4' of github.com:jumpserver/jumpserver into v4 2024-03-04 15:46:18 +08:00
ibuler 83bdf07600 perf: 修改翻译 2024-03-04 15:42:14 +08:00
fit2bot dfe4eddbbc
perf: translate (#12746) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-03-04 14:44:19 +08:00
ibuler 1caed59f76 merge: with remote 2024-03-04 14:03:05 +08:00
Bai 6db4e88a2c perf: 更新 poetry.lock 文件 2024-03-04 11:32:04 +08:00
halo 786cb23f98 perf: 优化ansible_winrm执行超时时间 2024-03-01 17:02:48 +08:00
fit2bot 133daeb664
perf: translate (#12739) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-01 15:42:21 +08:00
fit2bot 518ae3fa09
perf: 自动化资产探活支持Telnet方式 (#12728) 
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2024-03-01 15:05:34 +08:00
ibuler 18707d365b perf: 优化标签搜索资产使用的关系 2024-03-01 15:05:01 +08:00
wangruidong a4a8d1ecf0 perf: modify menu translate 2024-03-01 13:53:29 +08:00
Bryan 7ba24293d1
Merge pull request #12736 from jumpserver/pr@dev@master_fix 
fix: 解决冲突
 2024-02-29 16:38:43 +08:00
Bai f10114c9ed fix: 解决冲突 2024-02-29 16:37:10 +08:00
Bryan cf31cbfb07
Merge pull request #12729 from jumpserver/dev 
v3.10.4
 2024-02-29 16:19:59 +08:00
feng f0ffa2408d fix: 哨兵redis 密码里有@ 无法连接 2024-02-29 16:19:33 +08:00
jiangweidong b557e264bc fix: 账号备份选择SFTP有多个时，重复编码password会导致任务异常 2024-02-29 16:10:21 +08:00
ibuler 88a08a74f7 perf: 修改翻译 2024-02-29 14:57:38 +08:00
wangruidong 457d2b2359 fix: 作业管理资产根据标签过滤获取不对 2024-02-28 15:50:46 +05:00
feng c9e12a3027 perf: Modify some translations 2024-02-28 18:23:10 +08:00
fit2bot 82aa4a65ab
perf: account translate (#12723) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-02-28 17:32:29 +08:00
ibuler d46237f1bf merge: with remote 2024-02-28 16:32:46 +08:00
ibuler 1744f94910 perf: 修改翻译 2024-02-28 16:27:41 +08:00
Bai 8ebc99339b perf: 更新 poetry.lock 文件 2024-02-28 07:22:16 +05:00
wangruidong e71e335f5c fix: 终断任务时接口报错 2024-02-27 16:22:06 +05:00
Bai e308812429 perf: i18n settings-Security done. 2024-02-27 19:20:48 +08:00
fit2bot 2328ef0b0c
perf: account translate (#12719) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-27 19:17:40 +08:00
Bai 000c5770f2 perf: i18n settings-RemoteApp done. 2024-02-27 17:13:59 +08:00
Bai 9e1a3598ab perf: i18n settings-Components done. 2024-02-27 16:43:44 +08:00
Bai 7268f60343 perf: i18n settings-Storage done. 2024-02-27 14:59:22 +08:00
Bai c8b274031f perf: i18n settings-Auth done. 2024-02-27 11:25:42 +08:00
masix 7517e77af9 指定lxml版本为4.9.3 
修复SAML2认证回调/core/auth/saml2/callback/时偶发出现http 502错误
 2024-02-27 08:16:10 +05:00
wangruidong 889cdca3b0 fix: 操作日志资源类型搜索无效 2024-02-26 16:36:05 +05:00
wangruidong 4cfd1bc047 fix: 远程应用列表接口报错 2024-02-26 16:03:34 +05:00
Eric fc0891ceee perf: 会话生命周期日志翻译 2024-02-26 15:33:11 +05:00
feng cea16fc41f perf: 命令上传 取消input长度限制 2024-02-26 14:29:13 +05:00
fit2bot 4b7c0b8437 perf: 用户列表翻译超级管理员，组织管理员 2024-02-26 14:27:19 +05:00
Bai 10394dbb1c perf: i18n settings-Auth done. 2024-02-26 16:53:40 +08:00
Bai 859bb91fc7 perf: i18n settings-Features done. 2024-02-26 15:47:05 +08:00
fit2bot 09432b01a7
fix: 自动化任务密钥为 None 报错 (#12709) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-26 14:47:19 +08:00
wangruidong d7f8ba58ad perf: 作业日志添加任务类型 2024-02-26 13:43:49 +08:00
fit2bot 0fd0d33704
perf: i18n settings-notifications done. (#12702) 
Co-authored-by: Bai <baijiangjie@gmail.com>
Co-authored-by: Bryan <jiangjie.bai@fit2cloud.com>
 2024-02-23 18:09:18 +08:00
fit2bot ad0f489834
perf: translate (#12701) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-23 17:52:16 +08:00
fit2bot b1fa870de7
perf: 工作台相关翻译 (#12700) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-02-23 17:22:47 +08:00
Bai 7c5e2ae8ea perf: i18n settings-org done. 2024-02-23 15:17:17 +08:00
Bai c0e4065a45 perf: i18n settings-basic done. 2024-02-23 14:31:09 +08:00
吴小白 f660c38d80 fix: 添加 psycopg2 缺失依赖 2024-02-22 19:08:18 +08:00
fit2bot 35448eea9f
perf: 翻译 (#12690) 
Co-authored-by: feng <1304903146@qq.com>
 2024-02-22 17:46:12 +08:00
wangruidong edf0630cef fix: 用户列表导出优化 2024-02-22 17:44:56 +08:00
wangruidong 430f45a3ec perf: permissions i18n modify 2024-02-22 17:36:45 +08:00
Bai 71b6fd5326 perf: 修改翻译 2024-02-22 17:29:46 +08:00
wangruidong c4342567ba fix: 远程应用README国际化 2024-02-22 16:11:43 +08:00