Commits · 37be53f334d2cc4958cd220a07577ddf32221b70 · ops / jumpserver

22 Jul, 2019 4 commits
- Merge pull request #3004 from jumpserver/dev · 37be53f3
  老广 authored Jul 22, 2019
```
修改显示节点下的所有资产
```
  37be53f3
- Perm for assets (#3003) · 5f59c729
  老广 authored Jul 22, 2019
```
* [Update] 授权显示节点下所有的资产

* [Update] 修改返回资产的comment

* [Update] 修改节点返回字段
```
  5f59c729
- Perm for assets (#3002) · a8af4e88
  老广 authored Jul 22, 2019
```
* [Update] 授权显示节点下所有的资产

* [Update] 修改返回资产的comment
```
  a8af4e88
- [Update] 授权显示节点下所有的资产 (#3001) · 8f5e91bc
  老广 authored Jul 22, 2019
  
  8f5e91bc
19 Jul, 2019 5 commits
- Merge pull request #2996 from jumpserver/dev · 277bbc07
  BaiJiangJie authored Jul 19, 2019
```
Dev
```
  277bbc07
- Merge pull request #2995 from jumpserver/bugfix · d97654b8
  BaiJiangJie authored Jul 19, 2019
```
Bugfix
```
  d97654b8
- [Update] 修改列表日期2 · 7ec82cbc
  BaiJiangJie authored Jul 19, 2019
  
  7ec82cbc
- [Update] 修改列表日期 · 63c2343d
  BaiJiangJie authored Jul 19, 2019
  
  63c2343d
- [Bugfix] 修复date format错误 · d93fe113
  ibuler authored Jul 19, 2019
  
  d93fe113
18 Jul, 2019 15 commits
- Merge pull request #2991 from jumpserver/dev · fedfbba3
  BaiJiangJie authored Jul 18, 2019
```
Dev
```
  fedfbba3
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · 49ccba85
  ibuler authored Jul 18, 2019
  
  49ccba85
- [Update] 修改cache policy 开关 · 9903adf7
  ibuler authored Jul 18, 2019
  
  9903adf7
- Merge pull request #2990 from jumpserver/dev · 48cfc4d4
  BaiJiangJie authored Jul 18, 2019
```
Dev
```
  48cfc4d4
- Merge pull request #2989 from jumpserver/dev_bai · 1f5cc1ee
  BaiJiangJie authored Jul 18, 2019
```
[Update] 解决授权资产页面资产重复的问题
```
  1f5cc1ee
- [Update] 解决授权资产页面资产重复的问题 · ce1bb66f
  BaiJiangJie authored Jul 18, 2019
  
  ce1bb66f
- Merge pull request #2987 from jumpserver/dev · 6f9528d7
  BaiJiangJie authored Jul 18, 2019
```
Dev
```
  6f9528d7
- Merge pull request #2986 from jumpserver/dev_trans · fc01b952
  BaiJiangJie authored Jul 18, 2019
```
[Update] 修改翻译
```
  fc01b952
- [Update] 修改翻译 · 51f4c1cd
  BaiJiangJie authored Jul 18, 2019
  
  51f4c1cd
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · 8bb82d16
  ibuler authored Jul 18, 2019
  
  8bb82d16
- [Update] 优化详情页获取nodes · 1ef16d55
  ibuler authored Jul 18, 2019
  
  1ef16d55
- Merge pull request #2983 from jumpserver/dev · a242bdd3
  BaiJiangJie authored Jul 18, 2019
```
Dev
```
  a242bdd3
- Merge pull request #2984 from jumpserver/gateway_conn_bug · 97bc3d5e
  BaiJiangJie authored Jul 18, 2019
```
[Bugfix] 修复网关测试连接失败未捕获导致报500的bug
```
  97bc3d5e
- [Bugfix] 修复网关测试连接失败未捕获导致报500的bug · dbb27a77
  jym503558564 authored Jul 18, 2019
  
  dbb27a77
- [Bugfix] 修改排序，去掉标签 (#2982) · ea11aa4a
  八千流 authored Jul 18, 2019
```
* [Update] 修改排序，去掉标签

* [Bugfix] 修改排序

* [Bugfix] 修改小问题

* [Bugfix] 修改小问题
```
  ea11aa4a
17 Jul, 2019 9 commits
- [Update] 支持etag · 1af40b6c
  ibuler authored Jul 17, 2019
  
  1af40b6c
- Merge pull request #2981 from jumpserver/dev · 1b220326
  老广 authored Jul 17, 2019
```
Bugfix (#2980)
```
  1b220326
- Bugfix (#2980) · 8ed3bb85
  老广 authored Jul 17, 2019
```
* [Update] 修改排序，去掉标签

* [Update] 修改批量更新后刷新页面

* [Update] 修改面包屑

* [Update] 修改用户排序

* [Update] 处理未登录主机显示为负数

* [Update] 支持单个资产的搜索
```
  8ed3bb85
- Merge pull request #2978 from jumpserver/dev · 887cda32
  老广 authored Jul 17, 2019
```
Dev 修改private key校验
```
  887cda32
- [Update] 修改private创建 · 40de7d64
  ibuler authored Jul 17, 2019
  
  40de7d64
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · fbc948fd
  ibuler authored Jul 17, 2019
  
  fbc948fd
- [Update] 刷新session有效期 · 12b2f2f4
  ibuler authored Jul 17, 2019
  
  12b2f2f4
- Merge pull request #2976 from jumpserver/dev · 37c10c6c
  BaiJiangJie authored Jul 17, 2019
```
[Update] 解决授权资产显示禁用资产的问题 (#2975)
```
  37c10c6c
- [Update] 解决授权资产显示禁用资产的问题 (#2975) · 3451c2b4
  BaiJiangJie authored Jul 17, 2019
```
* [Update] 解决授权资产显示禁用资产的问题

* [Bugfix] 解决资产更新页面取消激活失败的问题

* [Bugfix] 解决资产详情页面禁用资产时会清除协议的问题

* [Bugfix] 解决创建/更新管理用户、系统用户提交密钥错误时报错的问题
```
  3451c2b4
16 Jul, 2019 7 commits
- Merge pull request #2973 from jumpserver/dev · 158e2a91
  BaiJiangJie authored Jul 16, 2019
```
Merge pull request #2972 from jumpserver/dev_bai
```
  158e2a91
- Merge pull request #2972 from jumpserver/dev_bai · 1c7a09c9
  BaiJiangJie authored Jul 16, 2019
```
[Update] 修改CommandFilter的system_users字段为不必填
```
  1c7a09c9
- Merge pull request #2971 from jumpserver/dev_bai · 28b77686
  BaiJiangJie authored Jul 16, 2019
```
[Update] 修改CommandFilter的system_users字段为不必填
```
  28b77686
- [Update] 修改CommandFilter的system_users字段为不必填 · d21bb520
  BaiJiangJie authored Jul 16, 2019
  
  d21bb520
- Merge pull request #2970 from jumpserver/dev · 7a82c91b
  BaiJiangJie authored Jul 16, 2019
```
Dev
```
  7a82c91b
- Merge pull request #2969 from jumpserver/dev_bai · bf2ed210
  BaiJiangJie authored Jul 16, 2019
```
[Update] 修改翻译
```
  bf2ed210
- [Update] 修改翻译 · 560be610
  BaiJiangJie authored Jul 16, 2019
  
  560be610