Commits · 3c7a6b422e565917d175401201aef5a7ac3f29ff · ops / coco

22 Jul, 2019 2 commits
- Merge pull request #248 from jumpserver/dev · 3c7a6b42
  老广 authored Jul 22, 2019
```
All assets (#247)
```
  3c7a6b42
- All assets (#247) · 49a5a804
  老广 authored Jul 22, 2019
```
* [Update] 支持节点查看所有资产

* [Update] 修改依赖版本

* [Update] filter assets
```
  49a5a804
18 Jul, 2019 7 commits
- Merge pull request #246 from jumpserver/dev · 01635fad
  BaiJiangJie authored Jul 18, 2019
```
Dev
```
  01635fad
- Merge pull request #245 from jumpserver/dev_bai · ff28d9a3
  BaiJiangJie authored Jul 18, 2019
```
[Update] sftp获取资产优先使用InteractiveServer缓存
```
  ff28d9a3
- [Update] sftp获取资产优先使用InteractiveServer缓存 · 8b1eab83
  BaiJiangJie authored Jul 18, 2019
  
  8b1eab83
- Merge pull request #244 from jumpserver/dev_bai · a70156a1
  BaiJiangJie authored Jul 18, 2019
```
[Update] 解决用户每次登录后，第一次获取节点树为空的问题
```
  a70156a1
- [Update] 解决用户每次登录后，第一次获取节点树为空的问题 · 5223cbf0
  BaiJiangJie authored Jul 18, 2019
  
  5223cbf0
- Merge pull request #242 from jumpserver/dev · 55841ed2
  BaiJiangJie authored Jul 18, 2019
```
Dev
```
  55841ed2
- [update] 修改依赖 · 04b0cdb5
  ibuler authored Jul 18, 2019
  
  04b0cdb5
17 Jul, 2019 3 commits
- Merge branch 'dev' of github.com:jumpserver/coco into dev · 05499094
  ibuler authored Jul 17, 2019
  
  05499094
- [Update] Api 请求支持etag · 9441dc70
  ibuler authored Jul 17, 2019
  
  9441dc70
- [Update] 优化命令过滤 · 9aced51d
  ibuler authored Jul 17, 2019
  
  9aced51d
15 Jul, 2019 3 commits
- Merge pull request #241 from jumpserver/dev · 484a75ec
  BaiJiangJie authored Jul 15, 2019
```
Dev
```
  484a75ec
- Merge pull request #240 from jumpserver/dev_bai · 0840e57a
  BaiJiangJie authored Jul 15, 2019
```
[Update] 修改版本号
```
  0840e57a
- [Update] 修改版本号 · f9ee8ec2
  BaiJiangJie authored Jul 15, 2019
  
  f9ee8ec2
12 Jul, 2019 2 commits
- Merge branch 'dev' of github.com:jumpserver/coco into dev · 14433065
  ibuler authored Jul 12, 2019
  
  14433065
- [Update] 修改requirements · e6270001
  ibuler authored Jul 12, 2019
  
  e6270001
09 Jul, 2019 2 commits
- Merge pull request #238 from jumpserver/bugfixexit · ffecf21c
  老广 authored Jul 09, 2019
```
fix bug: telnet exit problem
```
  ffecf21c
- fix bug: telnet exit problem · 65642683
  Eric authored Jul 09, 2019
  
  65642683
08 Jul, 2019 3 commits
- Merge pull request #237 from jumpserver/dev · 53d05885
  老广 authored Jul 08, 2019
```
Dev
```
  53d05885
- Merge branch 'dev' of github.com:jumpserver/coco into dev · bf89ac88
  ibuler authored Jul 08, 2019
  
  bf89ac88
- [Update] 优化log · 7a8b85d7
  ibuler authored Jul 08, 2019
  
  7a8b85d7
06 Jul, 2019 2 commits
- Merge pull request #236 from jumpserver/dev · b66d9a5f
  老广 authored Jul 06, 2019
```
Dev
```
  b66d9a5f
- Merge branch 'master' into dev · 8899fe5e
  老广 authored Jul 06, 2019
  
  8899fe5e
04 Jul, 2019 1 commit
- [Update] 修改版本 · a6c63178
  ibuler authored Jul 04, 2019
  
  a6c63178
03 Jul, 2019 2 commits
- Merge pull request #235 from jumpserver/dev_bugfix · e777f6ad
  BaiJiangJie authored Jul 03, 2019
```
[Bugfix] 修复复用连接时，如果系统用户用户名为空，复用连接失败的bug
```
  e777f6ad
- [Bugfix] 修复复用连接时，如果系统用户用户名为空，复用连接失败的bug · b02662c6
  BaiJiangJie authored Jul 03, 2019
  
  b02662c6
02 Jul, 2019 2 commits
- Merge pull request #233 from jumpserver/dev_bai · fdf0aa93
  BaiJiangJie authored Jul 02, 2019
```
[Bugfix] 命令过滤异常添加warning日志；优化sftp action校验
```
  fdf0aa93
- [Bugfix] 命令过滤异常添加warning日志；优化sftp action校验 · 52eb1c4f
  BaiJiangJie authored Jul 02, 2019
  
  52eb1c4f
25 Jun, 2019 1 commit

Dev (#231) · a8320a5c

BaiJiangJie authored Jun 25, 2019

* [Bugfix] 修改使用资产属性protocol和port的方式 (#224)

* [Bugfix] 修改使用资产属性protocol和port的方式

* [Update] windows支持通过ssh协议登录

* [Update] 修改依赖版本号

* [Update] telnet连接使用telnet_port

* [Update] 修改依赖版本号

* [update] change user content format

* [Update] 修改依赖版本号

* [Update] 修改依赖版本号

a8320a5c

21 Jun, 2019 1 commit
- Merge pull request #230 from jumpserver/dev_v · 6143be4d
  BaiJiangJie authored Jun 21, 2019
```
[Update] 修改依赖版本号
```
  6143be4d
20 Jun, 2019 5 commits
- [Update] 修改依赖版本号 · 1cb1d2af
  BaiJiangJie authored Jun 20, 2019
  
  1cb1d2af
- Merge pull request #229 from jumpserver/dev_req · 7cd93b6f
  BaiJiangJie authored Jun 20, 2019
```
[Update] 修改依赖版本号
```
  7cd93b6f
- [Update] 修改依赖版本号 · 304a7541
  BaiJiangJie authored Jun 20, 2019
  
  304a7541
- Merge pull request #228 from jumpserver/user_format · 9c6826ea
  BaiJiangJie authored Jun 20, 2019
```
[update] 修改session和ftp上传用户字段为：name (username)
```
  9c6826ea
- [update] change user content format · 29981937
  Eric authored Jun 20, 2019
  
  29981937
17 Jun, 2019 4 commits
- Merge pull request #227 from jumpserver/dev_req · 3d721c49
  BaiJiangJie authored Jun 17, 2019
```
[Update] 修改依赖版本号
```
  3d721c49
- [Update] 修改依赖版本号 · 4999683f
  BaiJiangJie authored Jun 17, 2019
  
  4999683f
- Merge pull request #226 from jumpserver/dev_bai · 7a664ebf
  BaiJiangJie authored Jun 17, 2019
```
[Update] telnet连接使用telnet_port
```
  7a664ebf
- [Update] telnet连接使用telnet_port · 1983a493
  BaiJiangJie authored Jun 17, 2019
  
  1983a493