Commit Graph

6264 Commits

Author SHA1 Message Date
老广
de89e7e80a Merge pull request #4095 from jumpserver/v4
Merge v4 to dev
2024-06-24 16:46:10 +08:00
ibuler
cd94116465 perf: list table help tip 2024-06-24 16:42:27 +08:00
ibuler
78706a0fb6 Merge branch 'v4' of github.com:jumpserver/lina into v4 2024-06-24 16:21:52 +08:00
ibuler
bee96b9e09 perf: use v-sanitize except v-html 2024-06-24 16:21:34 +08:00
feng626
47b5e4ba90 Merge pull request #4098 from jumpserver/pr@v4@translate
perf: Translate
2024-06-24 15:56:53 +08:00
feng
6583c27600 perf: Translate 2024-06-24 15:55:40 +08:00
ZhaoJiSen
ebba329a0d Merge pull request #4097 from jumpserver/pr@v4@fix_cloud_sync
fixed:Fixed an issue where resources were not displayed in cloud synchronization
2024-06-24 15:24:17 +08:00
zhaojisen
0aadfe5d24 fixed:Fixed an issue where resources were not displayed in cloud synchronization 2024-06-24 15:16:50 +08:00
ibuler
5e7e4151a3 merge: with remote 2024-06-24 15:04:40 +08:00
ibuler
4d418221d6 Merge branch 'v4' of github.com:jumpserver/lina into v4 2024-06-24 14:54:58 +08:00
ibuler
2d81cc857b perf: bulk delete msg display 2024-06-24 14:51:32 +08:00
ZhaoJiSen
b0ab3bf434 Merge pull request #4096 from jumpserver/pr@v4@fix_perm_rules
fixed: Fixed the issue that the latest authorization rule could not be displayed when the asset authorization was clicked again after successfully creating the asset authorization
2024-06-24 14:49:19 +08:00
zhaojisen
8eb381b81c fixed: Fixed the issue that the latest authorization rule could not be displayed when the asset authorization was clicked again after successfully creating the asset authorization 2024-06-24 14:38:42 +08:00
wangruidong
2e7611ad92 perf: Disable scheduled tasks for the community edition in account push 2024-06-24 11:51:28 +08:00
ZhaoJiSen
7955afcf35 Merge pull request #4094 from jumpserver/pr@v4@fix_system_role
fixed: Fixed the empty error message when the role detail page was removed
2024-06-24 11:45:36 +08:00
zhaojisen
8e8ee7c495 fixed: Fixed the empty error message when the role detail page was removed 2024-06-24 11:42:57 +08:00
ZhaoJiSen
f3f1da452e Merge pull request #4092 from jumpserver/pr@v4@fix_assets_perms
fixed: Fixed asset authorization jump error
2024-06-24 11:37:13 +08:00
zhaojisen
3efe6efa0b fixed: Fixed asset authorization jump error 2024-06-24 11:32:43 +08:00
ibuler
37453aaa11 Merge branch 'v4' of github.com:jumpserver/lina into v4 2024-06-24 11:10:57 +08:00
ibuler
47c26e93df perf: passkey help info 2024-06-24 11:05:14 +08:00
wangruidong
e3f5f948c3 perf: Optimize SSH key form in personal information settings 2024-06-24 11:00:34 +08:00
feng626
17d0dab859 Merge pull request #4090 from jumpserver/pr@v4@translate
perf: Translate
2024-06-24 10:57:03 +08:00
feng
02f5f4261e perf: Translate 2024-06-24 10:48:33 +08:00
Gerry.tan
5ccaa3b77d perf: 优化用户校验页面对密码进行加密传输 2024-06-24 10:38:00 +08:00
ibuler
fc4f10a7ea Merge branch 'v4' of github.com:jumpserver/lina into v4 2024-06-24 09:55:30 +08:00
ibuler
6d127bdee7 perf: 修改图标 2024-06-24 09:55:20 +08:00
feng626
00c5968380 Merge pull request #4089 from jumpserver/pr@v4@rbac_perm
perf: Edit rbac perms
2024-06-21 19:07:16 +08:00
feng
0f8e02c738 perf: Edit rbac perms 2024-06-21 19:04:59 +08:00
wangruidong
77c1af3dcf fix: The left asset tree refreshes every time a shortcut command is executed 2024-06-21 18:03:15 +08:00
ZhaoJiSen
ad52d17bda Merge pull request #4085 from jumpserver/pr@v4@fix_remote_detail
fixed: Fixed an issue where the app card would not jump when clicked
2024-06-21 10:57:18 +08:00
zhaojisen
d45e18fac6 fixed: Fixed an issue where the app card would not jump when clicked 2024-06-21 10:53:35 +08:00
feng626
5432306b1a Merge pull request #4084 from jumpserver/pr@v4@rbac
perf: System setting perm
2024-06-20 19:18:56 +08:00
feng
b1000227c0 perf: System setting perm 2024-06-20 19:17:54 +08:00
ZhaoJiSen
9d86a63b52 Merge pull request #4083 from jumpserver/pr@v4@fix_white_page
fixed: Fixed a blank page when users logged in for the first time
2024-06-20 18:47:31 +08:00
zhaojisen
32d6fc95be fixed: Fixed a blank page when users logged in for the first time 2024-06-20 18:44:07 +08:00
ZhaoJiSen
d7ff7c8038 Merge pull request #4081 from jumpserver/pr@v4@fix_dialog_close
fixed: Fixed an issue where MFA forms could not be closed
2024-06-20 18:13:39 +08:00
zhaojisen
b042bf4b55 fixed: Fixed an issue where MFA forms could not be closed 2024-06-20 18:10:22 +08:00
ZhaoJiSen
b315f65bcd Merge pull request #4080 from jumpserver/pr@v4@fix_table_width
style: table width
2024-06-20 16:38:51 +08:00
zhaojisen
ead06c5eae style: table width 2024-06-20 16:34:31 +08:00
ZhaoJiSen
b8b488274f Merge pull request #4079 from jumpserver/pr@v4@fix_role_sys
fixed: Fixed an issue where the delete prompt was incorrect when the user had only one organization role
2024-06-20 15:49:58 +08:00
zhaojisen
e54ac05df2 fixed: Fixed an issue where the delete prompt was incorrect when the user had only one organization role 2024-06-20 15:45:08 +08:00
ZhaoJiSen
6146ffc9c3 Merge pull request #4078 from jumpserver/pr@v4@fix_privileged_show
fixed: Change the way the unprivileged account field is displayed in the table
2024-06-20 15:16:25 +08:00
zhaojisen
0fcd8c134d fixed: Change the way the unprivileged account field is displayed in the table 2024-06-20 15:10:25 +08:00
ZhaoJiSen
ccac4745ea Merge pull request #4077 from jumpserver/pr@v4@fix_tags
fixed: Fixed an issue where clicking the Delete flag
2024-06-20 14:57:59 +08:00
zhaojisen
70dba5a317 fixed: Fixed an issue where clicking the Delete flag 2024-06-20 14:55:08 +08:00
feng626
f6adb3b1c3 Merge pull request #4075 from jumpserver/pr@v4@translate_all
perf: Translate
2024-06-19 19:37:07 +08:00
w940853815
27d3637330 Revert "fix: 待我审批列表页面默认过滤出还未审批的工单"
This reverts commit 91c44d0500.
2024-06-19 19:33:40 +08:00
feng
0b4b551d56 perf: Translate 2024-06-19 19:32:25 +08:00
wangruidong
9c8ceb04f0 perf: Disable editing labels for the root organization 2024-06-19 15:46:46 +08:00
ibuler
cd1e371acb Merge branch 'v4' of github.com:jumpserver/lina into v4 2024-06-19 13:17:23 +08:00