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

9030 Commits (c37e2d3dc26d14aac491379d1d2c1f6a94ff313f)

Author SHA1 Message Date
老广 2f1e60cf91
Merge pull request #9627 from jumpserver/pr@dev@fix_platform_activity_err 
fix: 平台Activity列表500
 2023-02-19 20:31:27 +08:00
jiangweidong 37f74d7d73 fix: 格式看起来好看 2023-02-19 20:27:25 +08:00
jiangweidong 7837a28200 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@fix_platform_activity_err 2023-02-19 20:20:49 +08:00
jiangweidong 3e7eef2522 fix: 平台Activity列表500 2023-02-19 20:20:42 +08:00
老广 7ea9b4d429
Merge pull request #9625 from jumpserver/pr@dev@fix_clean_activity_with_operation 
fix: 解决跨组织资源的Activty在其他组织下404的问题
 2023-02-19 20:05:42 +08:00
老广 68e82a9d6e
Merge pull request #9626 from jumpserver/pr@dev@fix_joblog_migrate_dependency 
fix: 解决JobLog表依赖顺序不对，导致从新迁移失败问题
 2023-02-19 20:05:08 +08:00
jiangweidong 485454f9c6 fix: 解决JobLog表依赖顺序不对，导致从新迁移失败问题 2023-02-19 19:49:06 +08:00
jiangweidong 3334f79e84 fix: 解决跨组织资源的Activty在其他组织下404的问题 2023-02-19 19:17:12 +08:00
老广 d795139108
Merge pull request #9624 from jumpserver/pr@dev@change_ldap_task_to_setting 
perf: 修改 ldap task 位置
 2023-02-19 18:01:47 +08:00
ibuler da017f2e78 perf: 修改 ldap task 位置 2023-02-19 17:57:48 +08:00
老广 ba366e64e7
Merge pull request #9623 from jumpserver/pr@dev@account_push 
perf: account push
 2023-02-19 16:03:13 +08:00
feng a4cb1690d6 perf: account push 2023-02-19 16:01:34 +08:00
老广 845fe291b1
Merge pull request #9622 from jumpserver/pr@dev@perf_nodes 
perf: 优化 asset 创建时 nodes 可能有问题
 2023-02-19 15:45:26 +08:00
ibuler a1440ee4e0 perf: 优化 asset 创建时 nodes 可能有问题 2023-02-19 15:43:56 +08:00
老广 076a4333a1
Merge pull request #9621 from jumpserver/pr@dev@perf_json_encoer_error 
perf: 优化 task 参数是 uuid 可能导致的问题
 2023-02-19 15:25:55 +08:00
ibuler 83c844292c perf: 优化 task 参数是 uuid 可能导致的问题 2023-02-19 15:10:10 +08:00
fit2bot bdb963750b
perf: oauth2 perm (#9620) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-18 17:55:11 +08:00
fit2bot fa8fdf71c1
perf: client upgrade (#9619) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-18 17:28:42 +08:00
fit2bot 9ed1b8fc86
perf: 修改 swagger 查询 (#9616) 
* perf: 修改 swagger 查询

* perf: 修改 operate log

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-17 21:11:06 +08:00
Bai 1035e27201 fix: 解决 swagger api 报错的问题 2023-02-17 21:10:16 +08:00
fit2bot 2b29ce69f4
perf: api dashboard (#9615) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-17 20:18:22 +08:00
fit2bot 60bdd17ca2
perf: login logs (#9614) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2023-02-17 20:15:52 +08:00
Aaron3S a79a766a6a fix: 修改 job 审计日志 2023-02-17 20:14:11 +08:00
Eric 40b49e258e perf: 去掉 tunnel 和 command 会话的监控 2023-02-17 20:13:51 +08:00
老广 2877ea0e3b
Merge pull request #9611 from jumpserver/pr@dev@perf_ping 
perf: 优化 Ping 和 telnet
 2023-02-17 19:42:50 +08:00
ibuler 10e50c7c2c perf: 修改 Ping 2023-02-17 19:42:14 +08:00
ibuler dd8bc5798b perf: 优化 Ping 和 telnet 2023-02-17 19:38:34 +08:00
Bai fb32c976b2 fix: 翻译所有 celerytask verbose 2023-02-17 19:25:19 +08:00
fit2bot 5f2f38d815
perf: mysql psql database (#9609) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-17 19:00:44 +08:00
ibuler 3cc22f8524 perf: settings 删掉 windows default shell 2023-02-17 17:19:46 +08:00
ibuler 98355ce468 perf: 优化一波 migrations 2023-02-17 17:19:18 +08:00
jiangweidong 23238ca8e0
fix: 解决一些资源的Activity日志无法查看问题 (#9608) 
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
 2023-02-17 17:17:25 +08:00
fit2bot 9a62a7aaab
pref: 修改 activity log (#9571) 
* pref: 修改 activity log

* perf: 优化 acitivity

* pref: 修改 activity

* fix: 修复一些运行问题

* fix: app.py 中添加 tasks import

* fix: 添加 activity_callback

* fix: 添加 execute_account_backup_plan activity_callback

* fix: 添加 activity_callback -> gather_asset_accounts

* fix: 对 celery 任务添加 activity_callback 回调

* fix: 修改翻译

---------

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-02-17 17:14:53 +08:00
老广 01c2e7128d
Merge pull request #9604 from jumpserver/pr@dev@fix_applets_no_icon 
fix: 远程应用图标无法显示问题
 2023-02-17 15:15:03 +08:00
jiangweidong 2cecf20944 fix: 远程应用图标无法显示问题 2023-02-17 15:04:30 +08:00
fit2bot 419381bd10
perf: account backup (#9603) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-17 14:34:51 +08:00
老广 40bd197581
Merge pull request #9601 from jumpserver/pr@dev@feat_protect_resource 
feat: 增加media权限控制
 2023-02-17 14:17:08 +08:00
Bai 1bfb434651 fix: 修复创建网关时, 没有保存到 Host 列表中的问题; 2023-02-17 13:58:08 +08:00
jiangweidong fa5097fe28 Merge branch 'dev' of http://github.com/jumpserver/jumpserver into pr@dev@feat_protect_resource 2023-02-17 13:42:51 +08:00
jiangweidong 7ff08b35fe feat: 添加依赖 2023-02-17 13:42:44 +08:00
jiangweidong 12afc2aff5 feat: 增加media权限控制 2023-02-17 13:40:26 +08:00
fit2bot 7040f46565
perf: account view secret mfa (#9600) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-17 12:30:11 +08:00
Bai d85b024c47 fix: 修复打开 PERM_SINGLE_ASSET_TO_UNGROUP_NODE 配置时返回两个收藏夹节点的问题 2023-02-17 11:11:57 +08:00
老广 355af42812
Merge pull request #9598 from jumpserver/pr@dev@perf_take_out_dbeaver_clickhouse 
perf: 去掉dbeaver的clickhouse协议
 2023-02-17 10:58:54 +08:00
jiangweidong 151433004c perf: 去掉dbeaver的clickhouse协议 2023-02-17 10:53:25 +08:00
fit2bot e056b31b4c
perf: 优化 index api 批量命令部分 (#9596) 
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2023-02-16 20:16:04 +08:00
fit2bot f7500b8aff
perf: account perm (#9595) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-16 19:39:10 +08:00
fit2bot fc2d7aafce
perf: push account (#9594) 
Co-authored-by: feng <1304903146@qq.com>
 2023-02-16 18:49:42 +08:00
老广 1298cc0a91
Merge pull request #9593 from jumpserver/pr@dev@perf_log_clean 
perf: 修改日志清理
 2023-02-16 18:47:26 +08:00
ibuler 0c30e509dc perf: 修改日志清理 2023-02-16 18:32:04 +08:00