Commits · 206e3fa33d776591f368bfc0108de92229fb39c2 · ops / coco

19 Jul, 2018 2 commits
- Merged in dev (pull request #86) · 206e3fa3
  广宏伟 authored Jul 19, 2018
```
[Bugfix] 修复session串行的问题
```
  206e3fa3
- [Bugfix] 修复session串行的问题 · 737b46f3
  ibuler authored Jul 19, 2018
  
  737b46f3
17 Jul, 2018 8 commits
- Merged in dev (pull request #84) · f98fe16e
  广宏伟 authored Jul 17, 2018
```
[Update] 修改版本号 1.3.2
```
  f98fe16e
- [Update] 修改版本号 1.3.2 · c31b22d4
  ibuler authored Jul 17, 2018
  
  c31b22d4
- Merged in dev (pull request #82) · 9f653b44
  广宏伟 authored Jul 17, 2018
```
[Bugfix] 修复单页面bug
```
  9f653b44
- [Bugfix] 修复单页面bug · 26bef252
  ibuler authored Jul 17, 2018
  
  26bef252
- Merged in dev (pull request #81) · 26961d13
  广宏伟 authored Jul 17, 2018
```
[Update] 系统用户在手动登录模式下，如果已经设置了username，连接资产时不再提示输入
```
  26961d13
- Merge remote-tracking branch 'github/dev' into dev · 3e51f523
  ibuler authored Jul 17, 2018
  
  3e51f523
- Merge pull request #70 from jumpserver/update_loginmode · c098006b
  老广 authored Jul 17, 2018
```
[Update] 系统用户在手动登录模式下，如果已经设置了username，连接资产时不再提示输入
```
  c098006b
- [Update] 系统用户在手动登录模式下，如果已经设置了username，连接资产时不再提示输入 · 47df690f
  BaiJiangJie authored Jul 17, 2018
  
  47df690f
16 Jul, 2018 2 commits
- Merged in dev (pull request #80) · 82cdaeb6
  广宏伟 authored Jul 16, 2018
```
Dev
```
  82cdaeb6
- [Update] 修改sdk 版本 · 6695adbe
  ibuler authored Jul 16, 2018
  
  6695adbe
13 Jul, 2018 1 commit
- Merge pull request #68 from jumpserver/telnet_settimeout · 6a72d9c0
  老广 authored Jul 13, 2018
```
[Update] 设置telnet连接timeout
```
  6a72d9c0
06 Jul, 2018 1 commit
- [Update] 在线会话，历史会话显示登录来源 Web/SSH Terminal · 80afe455
  BaiJiangJie authored Jul 06, 2018
  
  80afe455
02 Jul, 2018 12 commits
- [Update] 修改docker file · d7ae449d
  ibuler authored Jul 02, 2018
  
  d7ae449d
- [Update] 修改docker file · 54a295ca
  ibuler authored Jul 02, 2018
  
  54a295ca
- [Update] 修改docker file · 5bcbb37c
  ibuler authored Jul 02, 2018
  
  5bcbb37c
- [Update] 修改docker file · cc645463
  ibuler authored Jul 02, 2018
  
  cc645463
- Merge branch 'dev' of https://github.com/jumpserver/coco into dev · f6ca83c2
  BaiJiangJie authored Jul 02, 2018
  
  f6ca83c2
- [Update] 设置telnet连接timeout · 639f8786
  BaiJiangJie authored Jul 02, 2018
  
  639f8786
- Merged in dev (pull request #78) · 38b1ac6b
  广宏伟 authored Jul 02, 2018
```
Dev
```
  38b1ac6b
- [Merge] 修改冲突 · f46cd8cd
  ibuler authored Jul 02, 2018
  
  f46cd8cd
- Merge pull request #67 from jumpserver/update_versions · 26b5ad36
  老广 authored Jul 02, 2018
```
[Update] 更改依赖jumpserver-python-sdk依赖版本号
```
  26b5ad36
- Merge branch 'dev' of https://github.com/jumpserver/coco into dev · d832530c
  BaiJiangJie authored Jul 02, 2018
  
  d832530c
- [Update] 更改依赖jumpserver-python-sdk依赖版本号 · 82a9c34a
  BaiJiangJie authored Jul 02, 2018
  
  82a9c34a
- Merge pull request #66 from jumpserver/feature_telnet · 7295a354
  老广 authored Jul 02, 2018
```
[Feature] 添加功能，支持 telnet server.
```
  7295a354
29 Jun, 2018 1 commit
- [Feature] 添加功能: 支持 telnet server. · 581b66ea
  BaiJiangJie authored Jun 29, 2018
  
  581b66ea
27 Jun, 2018 5 commits
- Merged in dev (pull request #77) · 93013dd5
  广宏伟 authored Jun 27, 2018
```
[Update] 修复一个小bug
```
  93013dd5
- [Update] 修复一个小bug · 518a92d0
  ibuler authored Jun 27, 2018
  
  518a92d0
- Merged in dev (pull request #76) · aa4d989d
  广宏伟 authored Jun 27, 2018
```
Dev
```
  aa4d989d
- [Bugfix] 修复connect bug · 27c67ee0
  ibuler authored Jun 27, 2018
  
  27c67ee0
- [Bugfix] 修复connect with token的bug · 4a962d21
  ibuler authored Jun 27, 2018
  
  4a962d21
26 Jun, 2018 3 commits
- Merged in dev (pull request #74) · 8a416ea6
  广宏伟 authored Jun 26, 2018
```
[Update] 更新依赖sdk的版本
```
  8a416ea6
- Merge branch 'dev' of bitbucket.org:jumpserver/coco into dev · 75a776dd
  ibuler authored Jun 26, 2018
  
  75a776dd
- [Update] 更新依赖sdk的版本 · 244ab60b
  ibuler authored Jun 26, 2018
  
  244ab60b
25 Jun, 2018 1 commit
- Merged in dev (pull request #72) · 1b813240
  广宏伟 authored Jun 25, 2018
```
Dev
```
  1b813240
14 Jun, 2018 1 commit
- Merge branch 'dev' of https://github.com/jumpserver/coco into dev · 3bf37c83
  BaiJiangJie authored Jun 14, 2018
  
  3bf37c83
13 Jun, 2018 1 commit
- [Update] 修改网关的bug · 1df7614a
  ibuler authored Jun 13, 2018
  
  1df7614a
11 Jun, 2018 2 commits
- Merge branch 'dev' of https://github.com/jumpserver/coco into dev · 938bd695
  BaiJiangJie authored Jun 11, 2018
  
  938bd695
- [Update] 添加功能，系统用户选择登录模式(自动/手动登录) · fe7c8dad
  BaiJiangJie authored Jun 11, 2018
  
  fe7c8dad