Commits · v52 · ops / coco

28 Aug, 2019 2 commits
- Merge pull request #274 from jumpserver/v52_bai · 64e698c1
  BaiJiangJie authored Aug 28, 2019
```
[Update] 修改proxy日志
```
  64e698c1
- [Update] 修改proxy日志 · 441b3a5a
  BaiJiangJie authored Aug 28, 2019
  
  441b3a5a
26 Aug, 2019 2 commits
- Merge pull request #272 from jumpserver/v52_bugfix · 4ce577be
  BaiJiangJie authored Aug 26, 2019
```
fix web sftp select all items display
```
  4ce577be
- fix web sftp select all items display · 3608d961
  Eric authored Aug 26, 2019
  
  3608d961
19 Aug, 2019 2 commits
- Merge pull request #269 from jumpserver/websftp · 6273dda7
  BaiJiangJie authored Aug 19, 2019
```
[Bugfix] Upload file failed
```
  6273dda7
- upload file failed · 4f6e0055
  Eric authored Aug 19, 2019
  
  4f6e0055
16 Aug, 2019 2 commits
- Merge pull request #268 from jumpserver/master · 06bc2197
  BaiJiangJie authored Aug 16, 2019
```
Merge from master
```
  06bc2197
- Merge pull request #267 from jumpserver/dev · f0c63d9b
  老广 authored Aug 16, 2019
```
Dev
```
  f0c63d9b
14 Aug, 2019 5 commits
- Merge pull request #266 from jumpserver/bugfix · 1dad1749
  BaiJiangJie authored Aug 14, 2019
```
fix name bug
```
  1dad1749
- fix name bug · 8553ca0e
  Eric authored Aug 14, 2019
  
  8553ca0e
- Merge pull request #265 from jumpserver/websftp · 91ba02ae
  BaiJiangJie authored Aug 14, 2019
```
ftp 日志上传冗余问题
```
  91ba02ae
- ftp 上传冗余问题 · 2e2e49f6
  Eric authored Aug 14, 2019
  
  2e2e49f6
- Merge pull request #264 from jumpserver/dev · 0f03bb50
  老广 authored Aug 14, 2019
```
Dev
```
  0f03bb50
13 Aug, 2019 3 commits
- Merge pull request #263 from jumpserver/realip · 8feb45a9
  老广 authored Aug 13, 2019
```
[Update] 修改支持nginx proxy protocol
```
  8feb45a9
- [Update] 默认关闭 · 39d92b3a
  ibuler authored Aug 13, 2019
  
  39d92b3a
- [Update] 修改支持nginx proxy protocol · 8f87578a
  ibuler authored Aug 13, 2019
  
  8f87578a
12 Aug, 2019 1 commit
- Merge pull request #262 from jumpserver/dev · 765fedc1
  老广 authored Aug 12, 2019
```
Dev
```
  765fedc1
09 Aug, 2019 2 commits
- Merge pull request #261 from jumpserver/theme · 2d7aab29
  BaiJiangJie authored Aug 09, 2019
```
fix selected item display bug
```
  2d7aab29
- fix selected item display bug · ae3c047a
  Eric authored Aug 09, 2019
  
  ae3c047a
08 Aug, 2019 4 commits
- [Update] 修改选择gateway · 67bf0750
  ibuler authored Aug 08, 2019
  
  67bf0750
- Merge pull request #260 from jumpserver/dev · b9bc53d1
  老广 authored Aug 08, 2019
```
Dev
```
  b9bc53d1
- [Update] 去掉slb心跳导致的报错 · 6dfb4cb0
  ibuler authored Aug 08, 2019
  
  6dfb4cb0
- Merge branch 'dev' of github.com:jumpserver/coco into dev · 510513c1
  ibuler authored Aug 08, 2019
  
  510513c1
07 Aug, 2019 1 commit
- [Bugfix] 修复handle task · a2592688
  ibuler authored Aug 07, 2019
  
  a2592688
05 Aug, 2019 6 commits
- Merge pull request #258 from jumpserver/dev_bai · 61bae649
  BaiJiangJie authored Aug 05, 2019
```
[Update] Telent连接，添加终端类型配置项（选项协商使用）
```
  61bae649
- [Update] Telent连接，添加终端类型配置项（选项协商使用） · e5578a29
  BaiJiangJie authored Aug 05, 2019
  
  e5578a29
- Merge pull request #257 from jumpserver/dev_bai · 3e4529a0
  BaiJiangJie authored Aug 05, 2019
```
[Update] 优化telnet连接逻辑
```
  3e4529a0
- [Update] 优化telnet连接逻辑 · 5db8340f
  BaiJiangJie authored Aug 05, 2019
  
  5db8340f
- Merge pull request #256 from jumpserver/dev · 7e654cd6
  老广 authored Aug 05, 2019
```
支持上传目录和删除目录 (#250)
```
  7e654cd6
- 支持上传目录和删除目录 (#250) · 1919898d
  Eric_Lee authored Aug 05, 2019
```
* support upload folder

* sftp文件夹上传和强制删除开关设置

* fix get env value FORCE_REMOVE_FOLDER

* remove i18n words
```
  1919898d
31 Jul, 2019 1 commit
- Merge pull request #255 from jumpserver/dev · 6b5e9dd1
  老广 authored Jul 31, 2019
```
[Update] 关闭paramiko的多余日志
```
  6b5e9dd1
29 Jul, 2019 4 commits
- [Update] 关闭paramiko的多余日志 · b68b83df
  ibuler authored Jul 29, 2019
  
  b68b83df
- Merge pull request #254 from jumpserver/dev · 6c1dcebb
  老广 authored Jul 29, 2019
```
Dev
```
  6c1dcebb
- [Update] 修改dockerfile · e8cc3d4e
  ibuler authored Jul 29, 2019
  
  e8cc3d4e
- [Update] 修改依赖 · 0ddf2d2c
  ibuler authored Jul 29, 2019
  
  0ddf2d2c
25 Jul, 2019 3 commits
- Merge pull request #253 from jumpserver/dev · 47fc4b67
  老广 authored Jul 25, 2019
```
Dev
```
  47fc4b67
- Merge branch 'dev' of github.com:jumpserver/coco into dev · 82c5de1c
  ibuler authored Jul 25, 2019
  
  82c5de1c
- [Update] 添加和客户端保持心跳 · cd4a22d8
  ibuler authored Jul 25, 2019
  
  cd4a22d8
24 Jul, 2019 2 commits
- Merge pull request #252 from jumpserver/dev_bai · adc655f6
  BaiJiangJie authored Jul 24, 2019
```
[Update] 解决sftp登录，绕过校验系统用户手动登录的情况
```
  adc655f6
- [Update] 解决sftp登录，绕过校验系统用户手动登录的情况3 · 11dae336
  BaiJiangJie authored Jul 24, 2019
  
  11dae336