Commit Graph

2269 Commits

Author SHA1 Message Date
Eric
b953c6c5a2 ldap user import 2020-06-16 19:07:46 +08:00
Bai
2792e0c303 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 18:25:42 +08:00
Bai
d59946d5aa [Update] 删除GrantedAssets组件OnSelected中的方法调用 2020-06-16 18:25:09 +08:00
OrangeM21
dba6276f36 Merge remote-tracking branch 'origin/dev' into dev 2020-06-16 18:22:55 +08:00
OrangeM21
d9ea133db1 [fix] 2020-06-16 18:22:41 +08:00
Bai
7bc1912d6d Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 18:07:39 +08:00
Bai
f16d116234 [Update] 修改用户页面资产授权规则is_valid字段、授权的资产点击节点刷新table 2020-06-16 18:07:16 +08:00
ibuler
86306c7bc9 fix: 去掉debug 2020-06-16 18:05:08 +08:00
ibuler
8447e954cc Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 17:40:06 +08:00
ibuler
6ccdaf71e4 fix: 修改table config,变化时自动reload 2020-06-16 17:39:44 +08:00
OrangeM21
83537933b1 Merge remote-tracking branch 'origin/dev' into dev 2020-06-16 17:39:37 +08:00
OrangeM21
23b2209b3c [fix]命令执行Error 2020-06-16 17:39:16 +08:00
ibuler
2182cb33da Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 17:26:52 +08:00
ibuler
0a97ebd403 feat: 修改导出,修改用户创建和更新中的password 2020-06-16 17:22:41 +08:00
Bai
fb0f7bb0f8 [Update] 用户详情远程应用/数据库应用搜索框添加名称搜索 2020-06-16 17:17:23 +08:00
Bai
96eb5c435b [Update] 资产授权规则搜索有效添加children 2020-06-16 17:11:54 +08:00
Bai
a562a0b527 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 16:55:40 +08:00
Bai
193303e6c5 [Update] 解决用户详情资产授权规则列表跳转问题 2020-06-16 16:49:49 +08:00
OrangeM21
a44ca1bfc0 Merge remote-tracking branch 'origin/dev' into dev 2020-06-16 16:43:39 +08:00
OrangeM21
ca57a92d28 [fix]用户激活添加提示 2020-06-16 16:43:22 +08:00
Eric
870285e8e8 fix current org id missed 2020-06-16 16:42:25 +08:00
Bai
71dd590ab5 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 16:35:02 +08:00
Bai
7fb7b76d59 [Update] 修改收集用户任务创建/更新及列表页 2020-06-16 16:32:35 +08:00
OrangeM21
c976c7f160 [merge] 2020-06-16 16:21:14 +08:00
OrangeM21
31bf2b85ae [merge ] 2020-06-16 16:20:06 +08:00
Eric
39796edd35 fix perm system users url 2020-06-16 16:15:12 +08:00
OrangeM21
850144a3a9 修复搜索栏选项多余的问题 2020-06-16 16:08:14 +08:00
Bai
ed85d61f57 [Update] 任务详情RunInfoCard显示无 2020-06-16 16:06:50 +08:00
ibuler
c8e6a54fee feat: 会话管理中断任务说明 2020-06-16 15:42:23 +08:00
ibuler
3c980cfa92 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 15:30:07 +08:00
ibuler
2c9fa16a7c feat: gather user 添加搜索 2020-06-16 15:29:48 +08:00
Bai
ef11e3d0cf Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 15:23:32 +08:00
Bai
6b0b92c7c4 [Update] 更新网域创建资产必填 2020-06-16 15:23:12 +08:00
ibuler
1d14aa8f75 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 15:19:36 +08:00
ibuler
efaa116605 feat: 修改detail 2020-06-16 15:19:13 +08:00
OrangeM21
537d945485 Merge remote-tracking branch 'origin/dev' into dev 2020-06-16 15:11:31 +08:00
ibuler
a5f5833d7c Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 15:06:02 +08:00
ibuler
9d0562e11a fix: 修改资产标签 2020-06-16 15:05:45 +08:00
Bai
32ef10d6c8 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 14:58:59 +08:00
Bai
a5c70be7cb [Update] 在线会话加入按钮判断是否禁用 2020-06-16 14:58:42 +08:00
ibuler
ca8c06fc9b feat: 资产添加label搜索 2020-06-16 14:58:40 +08:00
ibuler
345a962aac fix: 修改同步实例任务中的时间显示,feat: 完成执行同步实例大人物 2020-06-16 14:32:42 +08:00
OrangeM21
98991af6ef [fix]修复Tree右键删除2条提示的问题 2020-06-16 14:32:16 +08:00
ibuler
afc7f75ef1 fix: 修复acount list 2020-06-16 14:18:25 +08:00
ibuler
79d11a64ed feat: 优化会话管理 2020-06-16 14:04:23 +08:00
ibuler
cf62fdc629 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 13:48:37 +08:00
ibuler
5df1355b5f feat: 修改session命令 2020-06-16 13:48:05 +08:00
Eric
fa60c3a169 fix ingore request error 2020-06-16 13:37:31 +08:00
ibuler
c73bb3f9c7 merge: with dev 2020-06-16 12:24:47 +08:00
Bai
2e7dfb8571 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 11:57:55 +08:00