Commit Graph

6986 Commits

Author SHA1 Message Date
OrangeM21
24a850c99f fix: 修正Dialog Title 错误 2020-07-02 12:01:30 +08:00
Orange
ecaa4cfa70
Merge pull request #117 from jumpserver/change_xpack_source
feat: 更新Xpack引用链接
2020-07-01 18:20:10 +08:00
OrangeM21
8aebf366bc fix: update xpack url 2020-07-01 18:15:58 +08:00
Orange
863b89888d
Merge pull request #116 from jumpserver/update_xpack_and_fix_bugs
fix: 修复资产页面Bug,更新Xpack依赖
2020-07-01 17:11:16 +08:00
OrangeM21
85012d9558 [fix]更新XPack,修复资产页面Bugs 2020-07-01 17:04:28 +08:00
八千流
7db080b418
Merge pull request #114 from jumpserver/fix_bugs_orange
fix:修复资产和前端bugs
2020-07-01 15:24:01 +08:00
Orange
622ab4cbc9
Merge pull request #113 from jumpserver/jym_dev
fix:优化导入、导出提示信息,以及优化一些表格显示不友好问题
2020-07-01 15:17:19 +08:00
jym503558564
f862a39c03 Merge branch 'v2.0' into jym_dev 2020-07-01 11:00:28 +08:00
jym503558564
c3d0367662 fix:优化表格一些显示不友好问题 2020-07-01 10:49:15 +08:00
jym503558564
75e234e3e2 fix:修改资产模块可连接提示信息 2020-07-01 10:49:02 +08:00
jym503558564
7f8aa6a65a fix:修改资产模块可连接提示信息 2020-07-01 10:48:30 +08:00
jym503558564
f6aa6fc2ac fix: 优化导出、导出、刷新按钮添加文字提示信息 2020-07-01 10:41:17 +08:00
OrangeM21
f1ad3ba85b fix: 批量修改设置管理用户为必选项 2020-06-30 17:48:10 +08:00
OrangeM21
55c959fd50 fix: 修复2.0.1的bugs 2020-06-30 14:41:04 +08:00
OrangeM21
7de33e175f fix: 优化表格宽度
优化表格宽度,调整表格宽度在窄页面和英文页面的表现

Closes https://github.com/jumpserver/jumpserver/issues/4173
2020-06-28 19:09:16 +08:00
OrangeM21
f7c3a3ac3b fix: 修复批量命令菜单联动
Closes #4180
2020-06-28 15:55:54 +08:00
OrangeM21
1d74137144 [fix]增加系统用户为自动推送时的手动推送全局按钮 2020-06-23 16:31:21 +08:00
OrangeM21
de547e6a5a [fix] 修复获取终端异常 2020-06-23 15:25:23 +08:00
Orange
d3ebdb0d61
Merge pull request #111 from jumpserver/v2.0.1
[update]修改版本号
2020-06-22 19:23:57 +08:00
OrangeM21
004c0e3f66 [update]修改版本号 2020-06-22 19:22:32 +08:00
老广
57e4b65059
Merge pull request #100 from jumpserver/dev
[hotfix]更改路由权限验证模块
2020-06-22 18:42:42 +08:00
Orange
bd0d1a1014
Merge pull request #109 from jumpserver/v2.0
[fix]更新路由权限,更新eslint Ignore
2020-06-22 18:36:20 +08:00
Orange
7b3e38ac78
Merge pull request #110 from jumpserver/v2.0.0_fix_route
[fix]抽象路由写法
2020-06-22 18:35:27 +08:00
OrangeM21
4927c6520a [fix]抽象路由写法 2020-06-22 18:31:59 +08:00
Orange
c10145c9cc
Merge pull request #108 from jumpserver/v2.0.0_fix_route
[fix]Terminal路由分组,更新Eslint
2020-06-22 16:25:43 +08:00
OrangeM21
7eccb20269 [fix]更新路由权限,更新eslint Ignore 2020-06-22 16:15:56 +08:00
Orange
26ec366332
Merge pull request #107 from jumpserver/dev
[hotfix]修复系统设置页面无法提交安全设置的问题
2020-06-19 18:56:57 +08:00
OrangeM21
0ed6ad055e [hotfix]修复系统设置页面无法提交安全设置的问题 2020-06-19 18:51:43 +08:00
Orange
ff5b77c1a9
Merge pull request #106 from jumpserver/dev
[fix]修复bugs
2020-06-19 18:34:18 +08:00
OrangeM21
7f788a4610 [fix]修复修改密码页面不会退出的问题 2020-06-19 16:45:13 +08:00
OrangeM21
553805e03d [fix]修复系统设置没有初始值的问题 2020-06-19 16:03:12 +08:00
OrangeM21
f9f90e55c1 [fix]修改页面路由权重问题 2020-06-19 15:08:14 +08:00
Orange
4be2db93c7
Merge pull request #105 from jumpserver/dev
[fix]fix bugs
2020-06-18 19:35:10 +08:00
OrangeM21
65855b3e07 [fix]无路由情况打印报错信息 2020-06-18 19:29:37 +08:00
OrangeM21
3ff5519bfa [hotfix]修复初始化获取命令执行为空导致无法登陆的问题 2020-06-18 18:52:33 +08:00
Orange
a79af0a7c4
Merge pull request #103 from jumpserver/dev
[hotfix]修复会话详情页面下载URL
2020-06-18 17:16:50 +08:00
OrangeM21
4f120ae81d [hotfix]修复会话详情页面下载URL 2020-06-18 17:15:18 +08:00
Orange
9e7c570216
Merge pull request #102 from jumpserver/dev
[hotfix]修改build目录
2020-06-18 15:34:38 +08:00
OrangeM21
1cd4f1f228 [hotfix]修改build目录 2020-06-18 15:32:11 +08:00
Orange
d35cfa11b0
Merge pull request #101 from jumpserver/dev
[hotfix]更改路由权限验证模块
2020-06-18 11:28:23 +08:00
OrangeM21
db30ce67a0 [hotfix]更改路由权限验证模块 2020-06-18 11:16:13 +08:00
Orange
5aa28903dd
Merge pull request #99 from jumpserver/dev
[feature] v2.0 Release
2020-06-18 11:04:32 +08:00
Orange
b67a383cd0
Merge pull request #98 from jumpserver/dev
[feature] v2.0 Release
2020-06-18 10:45:09 +08:00
OrangeM21
5f5474d10f [fix]修改过滤路由参数名称 2020-06-18 00:40:23 +08:00
OrangeM21
f0fbce4543 [fix]过滤路由 2020-06-17 20:55:40 +08:00
OrangeM21
3583657f4f [fix] 2020-06-17 19:55:52 +08:00
OrangeM21
987e44225a [fix] 2020-06-17 19:11:07 +08:00
OrangeM21
0615e0cd21 Merge remote-tracking branch 'origin/dev' into dev 2020-06-17 18:37:33 +08:00
OrangeM21
c8bc3ff0d2 [fix] 2020-06-17 18:37:18 +08:00
Bai
9a81e1bd11 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-17 17:24:46 +08:00