7143 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
ibuler	8e0117a100	fix: tree bug	2024-06-19 13:17:06 +08:00
ZhaoJiSen	1b0bb1a711	Merge pull request #4070 from jumpserver/pr@v4@fix_perm_delete ... fixed: Fixed the issue that the authorization file could not be deleted	2024-06-19 11:45:24 +08:00
zhaojisen	392d150396	fixed: Fixed the issue that the authorization file could not be deleted	2024-06-19 11:42:09 +08:00
ZhaoJiSen	c3114609f5	Merge pull request #4069 from jumpserver/pr@v4@fix_phone_require ... perf: Mobile phone is set as a required field	2024-06-19 11:32:13 +08:00
zhaojisen	1e82ca3f66	perf: Mobile phone is set as a required field	2024-06-19 11:27:55 +08:00
ZhaoJiSen	e4c7b1d8cf	Merge pull request #4068 from jumpserver/pr@v4@fix_refresh ... fixed: Fixed resource refresh issues	2024-06-19 10:58:50 +08:00
zhaojisen	942b74be8e	fixed: Fixed resource refresh issues	2024-06-19 10:55:32 +08:00
feng626	7841669db7	Merge pull request #4067 from jumpserver/pr@v4@translate_account ... perf: Translate account	2024-06-18 19:39:42 +08:00
feng	a0382dc984	perf: Translate account	2024-06-18 19:37:34 +08:00
ibuler	fdb52fb4f4	Merge branch 'v4' of github.com:jumpserver/lina into v4	2024-06-18 19:23:21 +08:00
ZhaoJiSen	38aa42ff9b	Merge pull request #4066 from jumpserver/pr@v4@fix_account_template ... fixed: Fixed the issue of abnormal automatic push items when editing template account	2024-06-18 19:22:31 +08:00
ibuler	802bf6f1e3	Merge branch 'v4' of github.com:jumpserver/lina into v4	2024-06-18 19:19:22 +08:00
zhaojisen	ae9312983a	fixed: Fixed the issue of abnormal automatic push items when editing template account	2024-06-18 19:16:36 +08:00
ZhaoJiSen	c156250c90	Merge pull request #4065 from jumpserver/pr@v4@fix_export_default ... fixed: Fixed export module default options	2024-06-18 18:07:40 +08:00
zhaojisen	5dcdbb702f	fixed: Fixed export module default options	2024-06-18 18:02:20 +08:00
wangruidong	ccd7b319c8	fix: 审计台仪表盘今日数据有问题	2024-06-18 17:59:18 +08:00
ibuler	4750f8388a	Merge branch 'v4' of github.com:jumpserver/lina into v4	2024-06-18 17:53:56 +08:00
ibuler	3fb47fb6ea	perf: 优化资产创建更新 labels	2024-06-18 17:53:36 +08:00
feng626	55637c7fa1	Merge pull request #4063 from jumpserver/pr@dev@account_template ... fix: Account tempalte update secret failed	2024-06-18 14:54:14 +08:00
feng	4e95c88318	fix: Account tempalte update secret failed	2024-06-18 14:52:50 +08:00
feng626	eba323fb64	Merge pull request #4062 from jumpserver/pr@v4@account_edit ... fix: Account tempalte update secret failed	2024-06-18 14:48:23 +08:00