github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
10,352 Commits
66 Branches
246 Tags
107 MiB
Commit Graph

10352 Commits (73db1bf50cc786cff107fd8a7df294999f949e9b)

Author SHA1 Message Date
fit2bot 91dce82b38
fix: 安全设置开启仅已存在用户登录，企业微信等扫描登录，如果用户不存在，还是会自动创建用户登录成功。 (#11651) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-21 17:01:03 +08:00
Bryan d102db7a7b
Merge pull request #11650 from jumpserver/pr@dev@dev_master 
fix: 解决 master 冲突
 2023-09-21 16:53:09 +08:00
Bai 1de7af4984 fix: 解决 master 冲突 2023-09-21 16:51:54 +08:00
Aaron3S 9892ff7dd6 feat: 代码片段支持 oracle 和 mariadb 2023-09-21 16:37:16 +08:00
老广 4cb499953c Revert "perf: 修复事务中任务执行" 
This reverts commit cdbe5d31e9.
 2023-09-21 15:40:39 +08:00
老广 0397bdeb46 Revert "perf: 修复 task id 不对的问题" 
This reverts commit 1d6d92c160.
 2023-09-21 15:39:29 +08:00
ibuler 1d6d92c160 perf: 修复 task id 不对的问题 2023-09-21 15:20:16 +08:00
ibuler cdbe5d31e9 perf: 修复事务中任务执行 2023-09-21 15:04:58 +08:00
fit2bot b023ca0c69
fix: saml 用户没现在记录 (#11641) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-21 14:02:09 +08:00
ibuler 803d590096 perf: 修改生成 applet accounts 2023-09-21 13:06:02 +08:00
ibuler e11367088a perf: 修改 acl 登录限制问题 2023-09-21 11:33:28 +08:00
jiangweidong 1c74dd00ba
fix: 解决sqlserver无法推送和改密的问题 (#11637) 2023-09-20 21:45:21 +08:00
Aaron3S ed832af631 fix: 修复运行job 组织切换问题 2023-09-20 18:26:47 +08:00
fit2bot 948c499d9e
fix: 修复仪表板图表时间范围不准 (#11633) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-20 17:41:35 +08:00
fit2bot a51549cf1c
perf: ansible任务 未激活的时候关闭定时任务 (#11631) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-20 15:30:29 +08:00
fit2bot 39baf88055
fix: ansible postgresql (#11629) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-20 14:29:53 +08:00
fit2bot 90131db55a
perf: 修改任务检查 (#11609) 
* perf: 修改任务检查

* perf: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-09-20 11:12:15 +08:00
“huailei000” ea3ff1ebcb perf: 优化登录页面移动端布局 2023-09-19 20:20:28 +08:00
Aaron3S f3ca45aa74 perf: 优化 Playbook 文件创建逻辑 2023-09-19 18:49:16 +08:00
老广 74cc174d7a
Merge pull request #11622 from jumpserver/pr@dev@perf_random_error 
fix: 修复 random error
 2023-09-19 18:15:50 +08:00
ibuler 0eba6d2175 fix: 修复 random error 2023-09-19 18:11:27 +08:00
fit2bot 58592a13e3
fix: 解锁ip失败问题 (#11611) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 17:38:46 +08:00
fit2bot b8fb23a0a0
perf: user setting (#11610) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 16:30:48 +08:00
Bai f5c43488fd perf: 优化 es host 中包含 # 字符时提示错误 2023-09-19 15:31:02 +08:00
Eric 19c76ba01c perf: 删除发布机执行的任务目录 2023-09-19 15:02:02 +08:00
Eric 68c4cd5928 perf: 修复发布机安装应用的报错 2023-09-19 15:01:37 +08:00
fit2bot e5bfa29c7b
fix: 创建用户推送失败问题 (#11606) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 14:53:43 +08:00
fit2bot cbb772def7
fix: 修复connection token 获取user错误 (#11603) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 11:09:58 +08:00
fit2bot e6fe7c489e
perf: 修改账号生成 (#11591) 
* perf: 修改账号生成

* perf: 修改账号模版支持策略

* perf: 修改特殊字符数量

* perf: 修改 model 继承

* perf: 修改顺序

* perf: 修改 requirements

* perf: 修改翻译

* perf: 修改随机生成密码

* perf: 修改密钥生成

* perf: 修复 bug

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-09-19 10:59:33 +08:00
fit2bot 0b30f5cf88
perf: 翻译 (#11602) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-19 10:36:03 +08:00
fit2bot 018f1a0e8d
perf: 删除管理用户错误提醒 (#11596) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-18 18:42:02 +08:00
fit2bot 24ed57b98a
fix: 三方登录用户无法下线 (#11592) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-18 16:20:55 +08:00
ibuler 04a790c4ee perf: 优化 account template platform required 2023-09-18 14:29:41 +08:00
ibuler 2d9a3ef7d4 perf: 修改 migrations，不生成新的迁移文件 2023-09-18 14:29:24 +08:00
ibuler 0d2adeccf2 perf: 优化 applet account delete 2023-09-18 14:18:24 +08:00
Eric 886f977311 perf: 修复 chrome 部分元素定位失败的问题 2023-09-18 14:10:24 +08:00
fit2bot 9367e79bcf
perf: 翻译 (#11583) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-18 11:11:12 +08:00
fit2bot af733ecbad
fix: 修改平台id序列化属性 改为非只读 (#11581) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-17 16:07:05 +08:00
fit2bot 09f9775eab
fix: 平台无category type 过滤 (#11580) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-17 12:50:31 +08:00
feng 1c2a362beb perf: 修改usersession 模块位置 2023-09-15 17:25:06 +08:00
Eric_Lee bb1e674367
Merge pull request #11578 from jumpserver/pr@dev@perf_host_deploy_log 
perf: 修复发布机历史执行任务日志无法查看的问题
 2023-09-15 17:18:45 +08:00
Eric a75677ab08 perf: 修复发布机历史执行任务日志无法查看的问题 2023-09-15 17:15:12 +08:00
fit2bot b1daa4d357
fix: 修改不常登录用户锁定逻辑 (#11576) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-15 16:39:49 +08:00
fit2bot c32271ec6f
fix: mysql 没配置ssl ansible 连接失败问题 (#11574) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-15 16:16:04 +08:00
Aaron3S beb4f14be9 perf: 优化 jobexecution 创建 2023-09-15 14:39:16 +08:00
fit2bot e719904874
fix: 修复工单回复报500 (#11571) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-15 11:26:13 +08:00
Eric_Lee 664bc2a4d9
Merge pull request #11568 from jumpserver/pr@dev@perf_deplay_task 
perf: 优化推送部署任务，事务提交后再执行
 2023-09-14 18:30:16 +08:00
ibuler b91db8c146 perf: 优化推送部署任务，事务提交后再执行 2023-09-14 18:17:22 +08:00
fit2bot 500aeeb77f
perf: 升级flower (#11567) 
Co-authored-by: feng <1304903146@qq.com>
 2023-09-14 18:15:25 +08:00
feng 3abc8bddfa feat: 用户在线session控制 2023-09-14 16:21:57 +08:00