Commit Graph

2269 Commits

Author SHA1 Message Date
OrangeM21
83e6b9d3c6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 20:23:10 +08:00
OrangeM21
0ad44b2802 [fix]修改资产详情 2020-06-04 20:22:45 +08:00
ibuler
f3dd64499b Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-04 20:22:37 +08:00
ibuler
56053f791b feat: 修改资产的一部分bug 2020-06-04 20:22:25 +08:00
ibuler
25700b197b feat: 修改命令批量执行的审计 2020-06-04 19:50:53 +08:00
Bai
2beb4b89da Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-04 18:32:39 +08:00
Bai
a38f179acb [Update] 更新用户首次登录页面 2020-06-04 18:32:23 +08:00
Eric
8268862b52 add dialogDetailformatter 2020-06-04 17:58:10 +08:00
xinwen
da70f1cba7 [Fix] Xpack/组织管理 2020-06-04 17:33:15 +08:00
xinwen
a6ed8333f4 [Fix] Xpack/收集用户 2020-06-04 17:33:02 +08:00
ibuler
7cf2aca5da feat:删掉cloudcenter, 添加vault 2020-06-04 17:15:01 +08:00
ibuler
8d5be17507 feat: 修改support地址 2020-06-04 17:10:39 +08:00
ibuler
552d45c970 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-04 17:07:24 +08:00
ibuler
d3120ed361 feat: 修改xpack和audits部分 2020-06-04 17:07:00 +08:00
Bai
2604d933dd Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-04 16:19:26 +08:00
Bai
eb60843192 [Update] 修改改密计划资产页面2 2020-06-04 16:19:02 +08:00
ibuler
a0e1baf4fa Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-04 16:00:21 +08:00
Bai
2350e12699 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-04 15:56:08 +08:00
Bai
aebc4856ee [Update] 修改改密计划资产页面 2020-06-04 15:55:52 +08:00
ibuler
154d118949 feat: 优化鉴权 2020-06-04 15:36:53 +08:00
Eric
f09e34a02f add terminal en cn 2020-06-04 15:33:45 +08:00
Eric
9d87be8744 add task monitor 2020-06-04 15:10:11 +08:00
ibuler
ff39a2a19a merge 2020-06-04 14:57:18 +08:00
ibuler
1760d43c9e feat: 修改权限和路由的计算方法 2020-06-04 14:55:07 +08:00
OrangeM21
6f93349c29 [fix]更新右键菜单样式 更新资产列表Dialog 2020-06-04 14:08:06 +08:00
OrangeM21
2034f54f5b [fix]修复资产列表没有Actions的问题 2020-06-04 13:26:29 +08:00
OrangeM21
0d489b8973 [fix]修复资产列表没有Actions的问题 2020-06-04 13:21:26 +08:00
OrangeM21
4f1e37022a [fix]修复SSHkey下载失败问题 2020-06-04 12:14:50 +08:00
OrangeM21
59480a2136 [fix]修改提示样式 2020-06-04 12:03:32 +08:00
OrangeM21
889dfa4f17 [fix]修改Tree移动节点的提示信息 2020-06-04 11:48:34 +08:00
OrangeM21
ea8ab91e59 [fix]修复可连接性测试问题 2020-06-04 11:41:54 +08:00
OrangeM21
96fff777b4 [fix]修复登录打开白屏的问题 2020-06-04 11:14:12 +08:00
ibuler
1ed6925549 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-03 21:10:23 +08:00
ibuler
622953a7b0 feat: merge 2020-06-03 21:10:00 +08:00
Bai
70088578ae [Update] 修改用户首次登陆完善个人信息表单中mfa字段的操作2 2020-06-03 21:07:20 +08:00
ibuler
fbd926405b feat: 修改permission 2020-06-03 21:04:33 +08:00
Bai
0ec21f72e9 [Update] 修改用户首次登陆完善个人信息表单中mfa字段的操作 2020-06-03 21:01:45 +08:00
ibuler
333cdfcb4c feat: 修改路由过滤方式 2020-06-03 20:36:46 +08:00
BaiJiangJie
e00a74472c
Merge pull request #82 from jumpserver/dev_flc
[Update] 添加用户首次登录页面重定向判断逻辑
2020-06-03 20:21:08 +08:00
Bai
4516f450fe [Update] 添加用户首次登录页面重定向判断逻辑 2020-06-03 19:57:04 +08:00
OrangeM21
fe91f27815 Merge remote-tracking branch 'origin/dev' into dev 2020-06-03 19:26:23 +08:00
OrangeM21
d9a87281d8 [fix]修复Logo问题 2020-06-03 19:26:06 +08:00
Eric
486f7e2675 offline session actions button 2020-06-03 19:00:31 +08:00
OrangeM21
ad1bfe46f1 [fix]优化Ztree 2020-06-03 18:54:41 +08:00
OrangeM21
f8acc688f6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-03 18:50:47 +08:00
OrangeM21
bae5181015 [fix]修复cookie设置登录问题 2020-06-03 18:50:33 +08:00
Eric
f5f02baf44 online session actions 2020-06-03 18:47:11 +08:00
BaiJiangJie
bb3d8dc062
Merge pull request #81 from jumpserver/dev_fl
Dev First login page
2020-06-03 18:39:19 +08:00
Bai
27c096ccca [Update] 添加用户首次登录页面 3 2020-06-03 18:30:42 +08:00
Bai
e1430eb64b [Update] 添加用户首次登录页面 2 2020-06-03 18:17:32 +08:00