Commit Graph

7199 Commits

Author SHA1 Message Date
Jiangjie.Bai
da66f5e123 perf: 优化命令过滤器页面说明文案 2022-07-14 15:30:59 +08:00
feng626
e4f33cce14
Merge pull request #1928 from jumpserver/pr@dev@ticket_default_org
fix: ticket del global org
2022-07-14 15:14:50 +08:00
feng626
a5b374e524 fix: ticket del global org 2022-07-14 15:13:02 +08:00
Jiangjie.Bai
0dfcf42635
Merge pull request #1927 from jumpserver/pr@dev@fix_mergemaster
fix: merge dev
2022-07-14 15:11:42 +08:00
Jiangjie.Bai
0aa42bc72a fix: merge dev 2022-07-14 15:10:26 +08:00
fit2bot
cbf76c17d5
pref: 系统用户有 key 后,更新显示指纹 (#1906)
Co-authored-by: ibuler <ibuler@qq.com>
2022-07-14 14:54:55 +08:00
“huailei000”
216a2df6da perf:优化默认主题文件格式 2022-07-14 14:53:36 +08:00
“huailei000”
0b2db0615e fix: 系统用户-telnet协议用户名设置为非必填 2022-07-14 14:47:22 +08:00
“huailei000”
3544fe5bfa fix: 修复无痕模式下其他组织创建新用户登录没有权限问题 2022-07-14 14:42:55 +08:00
feng626
2cd30fc9d8
Merge pull request #1921 from jumpserver/pr@dev@del_history_account
perf: 暂时禁用账号历史
2022-07-14 10:40:45 +08:00
feng626
71bbe7b0c5 perf: 暂时禁用账号历史 2022-07-14 10:38:51 +08:00
feng626
29f1523113
Merge pull request #1919 from jumpserver/pr@dev@audit_command_filter
perf: 批量命令添加搜索项
2022-07-13 17:34:24 +08:00
feng626
6b5981e3af perf: 批量命令添加搜索项 2022-07-13 17:33:13 +08:00
Jiangjie.Bai
273a6cbb3b feat: Endpoint 支持 oracle 版本 2022-07-13 16:32:01 +08:00
feng626
6c78f04d12
Merge pull request #1731 from jumpserver/pr@dev@ticket
fix: 工单 bug
2022-07-13 15:50:08 +08:00
feng626
1b86b4e4cd fix: ticket bug 2022-07-13 15:47:36 +08:00
“huailei000”
94d3560410 fix:资产授权-资产节点列表默认显示资产 2022-07-13 14:03:47 +08:00
“huailei000”
897749547d fix: 修复资产账号连续点击查看不触发问题 2022-07-13 14:03:06 +08:00
ibuler
6fb34451d9 perf: 修改主题 btn 颜色 2022-07-13 11:13:23 +08:00
ibuler
3fba41b27b perf: 优化配色 2022-07-13 10:03:11 +08:00
Jiangjie.Bai
6c5f991494 fix: 修改连接令牌 is_valid 字段 2022-07-12 18:33:58 +08:00
ibuler
e80499b7b4 fix: 修复普通用户登录默认 404
perf: 添加注释
2022-07-12 17:12:03 +08:00
feng626
732788ac72
Merge pull request #1905 from jumpserver/pr@dev@confirm
fix: oauth bind confirm url
2022-07-12 16:02:57 +08:00
feng626
5a63cd253d fix: oauth bind confirm url 2022-07-12 15:59:58 +08:00
feng626
bc17b5c504 feat: 工单支持审批时修改资产 2022-07-12 15:29:27 +08:00
feng626
5dfcfd7b71
Merge pull request #1904 from jumpserver/pr@dev@perf_colors
fix: theme colors default
2022-07-12 14:56:21 +08:00
feng626
39766553fa fix: theme colors default 2022-07-12 14:55:02 +08:00
ibuler
b6be60c584 perf: 优化 theme color 2022-07-12 14:15:45 +08:00
fit2bot
a6d9bd1ab3
perf: 优化 btn 颜色 (#1902)
* perf: 修改 theme

* perf: 优化 btn 颜色

Co-authored-by: ibuler <ibuler@qq.com>
2022-07-12 13:43:33 +08:00
ibuler
940a3c50f3 perf: 修改 theme 2022-07-12 13:28:28 +08:00
ibuler
ca45f61c2c perf: remove unused css 2022-07-12 10:29:05 +08:00
fit2bot
7644bffe12
feat: 添加连接令牌页面 (#1891)
* feat: 修改 API Key action 启停->启用/禁用

* feat: 添加连接令牌页面

* feat: 添加连接令牌页面

* feat: 修改敏感字段组件

* feat: 添加help text

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
2022-07-11 19:38:56 +08:00
feng626
ba1923cd21
Merge pull request #1899 from jumpserver/pr@dev@yarn_lock
perf: update yarn lock
2022-07-11 18:23:21 +08:00
feng626
e0dc7ab451 perf: update yarn lock 2022-07-11 18:21:57 +08:00
“huailei000”
3a1f0b6d38 fix: 修复info类型button的样式特殊处理 2022-07-11 18:19:52 +08:00
“huailei000”
13b91a541c fix: 修复el-link边框颜色 2022-07-11 17:06:59 +08:00
“huailei000”
0cd96e1d82 fix: 修复混合颜色方法判断错误问题 2022-07-11 15:55:51 +08:00
ibuler
efe6247dbc perf: 修改 theme color 2022-07-11 15:17:34 +08:00
ibuler
b8b7c73bb1 perf: 修改主题 2022-07-11 11:18:23 +08:00
“huailei000”
3b1ea689d1 perf: 删除没有引用的主题文件 2022-07-11 11:16:35 +08:00
“huailei000”
c5a611af06 perf: 修改淘宝镜像新域名 2022-07-11 11:09:25 +08:00
ibuler
ef41dc809c perf: 修改 demo 2022-07-08 15:38:42 +08:00
“huailei000”
bc0ca617a1 fix: 修复修改密码组件颜色随主题色变化 2022-07-08 15:38:11 +08:00
“huailei000”
d25620ecfe fix: 修复element-ui,link标签hover状态的颜色 2022-07-08 15:37:45 +08:00
“huailei000”
bc9d0aeeb3 fix: 修复工单查看受理人翻译问题、颜色问题;修复button focus状态下颜色问题 2022-07-08 13:34:54 +08:00
“huailei000”
bbd2951496 fix: 修复命令存储默认初始值不准确问题 2022-07-08 11:19:58 +08:00
“huailei000”
0d80eca595 feat: 添加主题预览功能 2022-07-07 19:43:03 +08:00
fit2bot
d8cf5ad553
perf: 修改一些名字 (#1882)
* perf: 修改一些名字

* perf: 修改 colors

Co-authored-by: ibuler <ibuler@qq.com>
2022-07-07 18:34:15 +08:00
“huailei000”
ec9b8f0005 perf: 优化修改主题相关方法传参 2022-07-07 18:07:38 +08:00
feng626
d98c961fd8
Merge pull request #1880 from jumpserver/pr@dev@confirm
fix: 调整confirm
2022-07-07 17:07:28 +08:00