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

10308 Commits (138adeff763e7609580b4208941af82fe0a66e55)

Author SHA1 Message Date
feng 7506c7ea43 fix: 修复密钥校验ansible不支持{% 2023-08-17 16:16:34 +05:00
老广 f6f162ec3a
Merge pull request #11324 from jumpserver/pr@master@perf_django_ca_version 
perf: 修改 django cas version
 2023-08-17 17:43:23 +08:00
老广 2e840e3b05
Merge pull request #11323 from jumpserver/pr@dev@perf_django_ca_version 
perf: 修改 django cas version
 2023-08-17 17:43:04 +08:00
ibuler ff4560c2a7 perf: 修改 django cas version 2023-08-17 09:42:27 +00:00
ibuler deeb8da226 perf: 修改 django cas version 2023-08-17 17:39:58 +08:00
Bryan 03273b2ec4
Merge pull request #11322 from jumpserver/dev 
v3.6.0
 2023-08-17 13:56:25 +05:00
老广 737cae8d03
Merge pull request #11320 from jumpserver/pr@dev@fix_operatelog_not_record_component 
fix: 操作日志判断is_service_account为匿名用户会报错
 2023-08-17 16:29:04 +08:00
jiangweidong cf6ce0fa2e fix: 操作日志判断is_service_account为匿名用户会报错 2023-08-17 16:21:30 +08:00
fit2bot 7dd6ee5f1a
perf: translate (#11319) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-17 15:34:50 +08:00
老广 91432f0e8f
Merge pull request #11318 from jumpserver/pr@dev@update_poetry_lock 
perf: 更新 poetry lock
 2023-08-17 15:28:51 +08:00
ibuler 6c36b5be92 perf: 更新 poetry lock 2023-08-17 15:25:44 +08:00
Bai 7b89055fbf fix: 账号备份参数控制 2023-08-17 11:50:17 +05:00
jiangweidong c0f3769f9f perf: 优化组件的操作行为不记录到操作日志中 2023-08-17 11:49:57 +05:00
fit2bot b20abb494f
perf: 优化 vault 配置 (#11313) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-17 12:12:58 +08:00
老广 a084bc9962
Merge pull request #11310 from jumpserver/pr@dev@perf_applet_deploy 
perf: 优化发布机的注册名称，避免重复
 2023-08-17 10:59:53 +08:00
老广 cbb615e2ce
Merge pull request #11311 from jumpserver/pr@dev@perf_applet_enterprise 
perf: applet 上传检查版本
 2023-08-17 10:57:53 +08:00
ibuler 769d5fbd96 perf: applet 上传检查版本 2023-08-17 10:54:35 +08:00
Eric bbd36fea03 perf: 优化发布机的注册名称，避免重复 2023-08-17 10:33:59 +08:00
老广 9317d9e35e
Merge pull request #11307 from jumpserver/pr@dev@perf_add_xframe_option 
perf: add iframe option
 2023-08-17 10:21:53 +08:00
ibuler f697033252 perf: add iframe option 2023-08-17 10:18:27 +08:00
老广 eb8d80d417
Merge pull request #11302 from jumpserver/pr@dev@fix_ops_shell_run_failed 
fix: 修复 shell 批量命令无法执行的问题
 2023-08-16 18:43:35 +08:00
老广 d5ac8b16f1
Merge pull request #11305 from jumpserver/pr@dev@perf_task_err 
perf: 修复发布机任务执行失败的问题
 2023-08-16 18:43:02 +08:00
老广 ed54cc8507
Merge pull request #11306 from jumpserver/pr@dev@perf_chrome_ext 
fix: 修复 chrome 插件不生效的问题
 2023-08-16 18:33:14 +08:00
ibuler 40248077cd fix: 修复 chrome 插件不生效的问题 2023-08-16 18:30:29 +08:00
Eric 45e1723aa9 perf: 修复发布机任务执行失败的问题 2023-08-16 18:17:32 +08:00
Aaron3S af9f7060be fix: 修复 shell 批量命令无法执行的问题 2023-08-16 17:01:35 +08:00
Eric 8f10b84e94 perf: 修复 Chrome 执行脚本失败，页面卡在进度条界面的问题 2023-08-16 13:48:00 +05:00
halo d02cbcc3a3 perf: linux客户端文件后缀 2023-08-16 13:47:30 +05:00
ibuler 689fd12141 perf: windows 可以添加 sftp 2023-08-16 12:24:56 +05:00
Eric 3c9c494979 perf: 修复发布机因同名账号创建造成的部署异常 2023-08-16 12:15:02 +05:00
老广 16ceb79427
Merge pull request #11292 from jumpserver/pr@dev@k8s_add_icon 
perf: 修改 k8s icon
 2023-08-16 13:44:51 +08:00
老广 cd5e53e3dc
Merge pull request #11293 from jumpserver/pr@dev@oracledb_thin_mode 
perf: python-oracledb Thin Mode
 2023-08-16 13:44:26 +08:00
吴小白 df1aa73723 perf: python-oracledb Thin Mode 2023-08-16 13:11:48 +08:00
ibuler ceee2e1633 perf: 修改 k8s icon 2023-08-16 11:42:36 +08:00
吴小白 91867fa01d
Merge pull request #11291 from jumpserver/pr@dev@perf_Dockerfile 
perf: 优化构建企业版本镜像
 2023-08-16 11:24:18 +08:00
吴小白 dfde9258c7 perf: 优化构建企业版本镜像 2023-08-16 11:17:53 +08:00
fit2bot fc595bc4e4
perf: 启动 ssh 隧道错误处理优化 (#11287) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-15 18:50:48 +08:00
老广 48aa48e7a3
Merge pull request #11262 from jumpserver/pr@dev@revert_dockerfile 
revert: 还原构建
 2023-08-15 18:37:56 +08:00
老广 479378aa46
Merge branch 'dev' into pr@dev@revert_dockerfile 2023-08-15 18:37:38 +08:00
fit2bot 362c2a9509
perf: 修改翻译 账号模版批量添加 config配置文件 (#11286) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-15 18:24:01 +08:00
老广 a423d241a5
Merge pull request #11285 from jumpserver/pr@dev@perf_settings 
perf: 再次修改 setting
 2023-08-15 17:00:14 +08:00
ibuler 9e6221443e perf: 再次修改 setting 2023-08-15 16:58:41 +08:00
fit2bot 12744a08af
perf: vault 日志 (#11282) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-15 15:09:25 +08:00
老广 5e29c7e7bf
Merge pull request #11275 from jumpserver/pr@dev@perf_setting 
perf: 优化设置布局
 2023-08-15 13:52:54 +08:00
ibuler 02f38fe37a perf: merge with dev 2023-08-15 13:51:59 +08:00
ibuler 663ccbca6f perf: 修改翻译 2023-08-15 13:49:56 +08:00
ibuler c4528612d5 perf: 修改完成 2023-08-15 13:45:44 +08:00
Bai 7707101379 perf: 优化飞书信息通知文案 2023-08-15 08:17:24 +05:00
BoringCat 873e6d1ab9 修复飞书markdown信息渲染问题 2023-08-15 07:47:21 +05:00
fit2bot 7ba261c4f0
perf: vault 同步日志 (#11278) 
Co-authored-by: feng <1304903146@qq.com>
 2023-08-15 10:32:03 +08:00