Commit Graph

6986 Commits

Author SHA1 Message Date
xinwen
e3e57141ee [Update] 去掉 会话管理/历史会话 导出按钮 2020-06-10 20:25:37 +08:00
ibuler
03dc949e26 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-10 20:07:28 +08:00
ibuler
68390ea3ea fix: 修改asset select 循环引用bug 2020-06-10 20:06:30 +08:00
OrangeM21
346b6fd7a8 [fix]添加删除提醒 2020-06-10 19:52:42 +08:00
xinwen
8270767076 [Update] 用户详情/登录复核 颜色 2020-06-10 19:09:16 +08:00
xinwen
058400724d [Fix] 用户登录复核 bug 2020-06-10 19:01:31 +08:00
Bai
52a0ae0c25 [Update] 资产列表页面添加批量更新所选(Dialog) 2020-06-10 18:50:57 +08:00
ibuler
ffbd8ce88d fix: 修改dialog和select2 2020-06-10 18:47:28 +08:00
Bai
caad5950f6 [Update] 用户列表页面添加批量更新所选(Dialog) 2020-06-10 18:28:35 +08:00
ibuler
2f7e817282 feat: 修改导入导出dialog 2020-06-10 18:20:22 +08:00
ibuler
ae39f2c61c feat: 修改一个css 2020-06-10 18:16:58 +08:00
ibuler
ceb0dac72a Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-10 18:14:46 +08:00
ibuler
df3050b6f6 feat: 修改Upload key 2020-06-10 18:13:05 +08:00
xinwen
899e1a558f [Fix] 会话管理-历史回话-下载按钮跳回dashboard页面 2020-06-10 17:35:45 +08:00
ibuler
1b312b2ded feat: 修改select2 value值 2020-06-10 17:04:31 +08:00
ibuler
8b7f716f96 feat: 修改reset 2020-06-10 16:53:23 +08:00
ibuler
4805486131 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-10 15:07:32 +08:00
OrangeM21
660e3a3b27 [fix]修复用户链接资产跳转问题 2020-06-10 14:43:28 +08:00
OrangeM21
80b67c6862 fix 2020-06-10 14:32:35 +08:00
OrangeM21
87dafbfdc2 添加Vault下载导入需要MFA确认 2020-06-10 14:30:55 +08:00
ibuler
dc35b2935d Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-10 13:58:49 +08:00
ibuler
3da44667bd feat: 修改命令过滤 2020-06-10 13:56:59 +08:00
ibuler
a54cbec098 feat: 修改command filter 2020-06-10 13:20:29 +08:00
OrangeM21
1caa675b56 [fix]添加命令执行翻译 2020-06-10 12:01:20 +08:00
xinwen
e240afed02 [Update] xpack优化创建同步任务表单,左侧菜单也没有高亮 2020-06-10 11:32:57 +08:00
xinwen
6c681b7bdb [Update] 作业中心/批量命令 i18n 2020-06-10 11:32:57 +08:00
Bai
9825d1937b [Update] 创建授权规则添加默认开始日期 2020-06-10 11:10:50 +08:00
BaiJiangJie
2e0fd71945
Merge pull request #92 from jumpserver/dev_perms
Dev perms
2020-06-10 10:41:41 +08:00
Bai
3a5469f4e5 [Update] 修改改密计划详情资产页AssetRelationCard组件 2020-06-09 20:55:12 +08:00
ibuler
9809728d78 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-09 20:54:56 +08:00
ibuler
85ba553866 feat: 修改路由 2020-06-09 20:54:26 +08:00
Bai
d8b42b24ac [Update] 添加AssetRelationCard组件 2020-06-09 20:49:34 +08:00
Bai
de6c0e8cfc [Update] 修改资产授权规则详情资产页面Relation 2020-06-09 20:43:07 +08:00
xinwen
d84fbb1858 [Update] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 2020-06-09 20:24:05 +08:00
ibuler
fbba875cfa feat: 修改ztree高度 2020-06-09 20:04:25 +08:00
ibuler
b8966748d6 feat: 修改asset select 2020-06-09 19:56:44 +08:00
Bai
2111380838 [Update] 修改资产授权规则详情资产页reloadTable 2020-06-09 19:27:04 +08:00
ibuler
4b4bb455d6 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-09 18:54:27 +08:00
Bai
6bfd5f4c4a [Update] 修改资产授权规则详情用户页reloadTable 2020-06-09 18:52:08 +08:00
Eric
ce864c4f34 替换位置 2020-06-09 18:41:55 +08:00
ibuler
2f274edd2b Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-09 18:28:25 +08:00
ibuler
ed2c17bd4c feat: ztree添加高度 2020-06-09 18:27:57 +08:00
Bai
cb29943e8b [Update] 修改授权规则详情文案 2020-06-09 18:25:21 +08:00
ibuler
de12c20854 feat: 添加翻译 2020-06-09 18:19:30 +08:00
Bai
1a84cb9636 [Update] 修改资产授权规则is_valid字段 2020-06-09 18:17:39 +08:00
Bai
b3c591ab26 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-09 18:12:24 +08:00
Bai
747602e7bf [Update] 创建/更新授权规则页面添加DateStart字段 2020-06-09 18:12:07 +08:00
OrangeM21
42d841f855 Merge remote-tracking branch 'origin/dev' into dev 2020-06-09 17:44:16 +08:00
OrangeM21
50268991f9 [fix]退出之后清除Cookie 2020-06-09 17:38:12 +08:00
ibuler
6d024f48cb Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-09 17:28:59 +08:00