Commits · a1862d912a97f4c9fa7a2aa3be5a375dd9b2136b · ops / jumpserver

25 Mar, 2016 3 commits
- Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder · a1862d91
  liuzheng712 authored Mar 25, 2016
  
  a1862d91
- Merge pull request #161 from jumpserver/user_edit · 4f79e909
  ibuler authored Mar 25, 2016
```
fix(user edit) 修改用户导致密码问题
```
  4f79e909
- fix(user edit) 修改用户导致密码问题 · 69061791
  ibuler authored Mar 25, 2016
```
简单修改，更改结构和变量名

close #160
```
  69061791
24 Mar, 2016 11 commits
- Merge pull request #159 from jumpserver/terminal_font · 38f15c97
  ibuler authored Mar 24, 2016
```
fix(web terminal) Windows 浏览器使用chrome -换行
```
  38f15c97
- fix(web terminal) Windows 浏览器使用chrome -换行 · b745ebdd
  ibuler authored Mar 24, 2016
```
经测试由于字体原因，可以安装Monaco字体解决，然而不太方便

添加第二字体为 微软雅黑，经测试解决

fixed
close #158
```
  b745ebdd
- Merge pull request #157 from jumpserver/force_del_user · ae58fd54
  ibuler authored Mar 24, 2016
```
fix(userdel) 修复无法删除在线用户bug
```
  ae58fd54
- fix(userdel) 修复无法删除在线用户bug · fbc3078c
  ibuler authored Mar 24, 2016
```
当用户已经登录到jumpserver时，web上删除用户时失败，也没有提示

修改方法: userdel -r -f 强制删除

close #156
```
  fbc3078c
- Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder · 860c7f15
  liuzheng712 authored Mar 24, 2016
  
  860c7f15
- update · 3fcd9589
  liuzheng712 authored Mar 24, 2016
  
  3fcd9589
- update · ba5e90ab
  liuzheng712 authored Mar 24, 2016
  
  ba5e90ab
- Merge pull request #155 from kelianchun/dev · 5587ff59
  kelianchun authored Mar 24, 2016
```
Dev
```
  5587ff59
- remove ps1 search · 6d329b13
  kelianchun authored Mar 24, 2016
```
remove ps1 search
```
  6d329b13
- update jumpserver.conf only for myself · 357aea16
  liuzheng712 authored Mar 24, 2016
  
  357aea16
- update settings for myself, use sqlite · 3ab0c944
  liuzheng712 authored Mar 24, 2016
  
  3ab0c944
23 Mar, 2016 20 commits
- update · b3f83c33
  liuzheng712 authored Mar 23, 2016
  
  b3f83c33
- update_TermLogRecorder · 17a7470a
  liuzheng712 authored Mar 23, 2016
  
  17a7470a
- update_TermLogRecorder · 365a5ccd
  liuzheng712 authored Mar 23, 2016
  
  365a5ccd
- Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder · 742a2b1b
  liuzheng712 authored Mar 23, 2016
  
  742a2b1b
- update · 388ebe3b
  liuzheng712 authored Mar 23, 2016
  
  388ebe3b
- Merge pull request #154 from jumpserver/term_log_bug · 6d302eb2
  ibuler authored Mar 23, 2016
```
fix: command recoder bug fix
```
  6d302eb2
- 日志记录 · fa1f2404
  liuzheng712 authored Mar 23, 2016
  
  fa1f2404
- 修复tmux等会重复出现命令的bug · 52d8825d
  liuzheng712 authored Mar 23, 2016
  
  52d8825d
- model · e743ae3d
  liuzheng712 authored Mar 23, 2016
  
  e743ae3d
- Update run_server.py · db72048c
  kelianchun authored Mar 23, 2016
  
  db72048c
- fix: command recoder bug fix · f1ff52eb
  liuzheng712 authored Mar 23, 2016
  
  f1ff52eb
- Merge pull request #152 from jumpserver/pyte · 0b058998
  ibuler authored Mar 23, 2016
```
change(install.py) 增加pyte库
```
  0b058998
- change(install.py) 增加pyte库 · bd59b631
  ibuler authored Mar 23, 2016
```
增加pyte库来分析命令
```
  bd59b631
- Merge pull request #149 from kelianchun/dev · dc2ea0d6
  kelianchun authored Mar 23, 2016
```
Dev
```
  dc2ea0d6
- Update run_server.py · 73382cbc
  kelianchun authored Mar 23, 2016
  
  73382cbc
- deal command data · e6254ddc
  kelianchun authored Mar 23, 2016
```
deal command data
```
  e6254ddc
- Merge pull request #148 from kelianchun/dev · 30607730
  kelianchun authored Mar 23, 2016
```
no command data
```
  30607730
- no command data · b92c5188
  kelianchun authored Mar 23, 2016
```
no command data
```
  b92c5188
- Merge pull request #147 from jumpserver/bug_asset_upload_01 · 524cd1d9
  ibuler authored Mar 23, 2016
```
fix asset upload bug
```
  524cd1d9
- fix asset upload bug · 231f9619
  wangyong authored Mar 23, 2016
  
  231f9619
22 Mar, 2016 2 commits
- Merge pull request #140 from Astraeux/smtp_ssl_fix · 300e1061
  ibuler authored Mar 22, 2016
```
SMTP发邮件支持SSL
```
  300e1061
- Merge pull request #141 from jumpserver/termShake · 57e85aff
  ibuler authored Mar 22, 2016
```
fix: when moniter the terminal, fix the shake
```
  57e85aff
21 Mar, 2016 4 commits
- fix: when moniter the terminal, fix the shake · 34b74b9e
  liuzheng712 authored Mar 21, 2016
  
  34b74b9e
- SMTP发邮件支持SSL · c2189495
  Astraeux authored Mar 21, 2016
  
  c2189495
- Merge pull request #3 from jumpserver/dev · 4b90cd9b
  Astraeux authored Mar 21, 2016
```
update from origin
```
  4b90cd9b
- Merge pull request #139 from jumpserver/issue_52_bugfix · fcb3fd71
  ibuler authored Mar 21, 2016
```
Issue 52 bugfix: 修复录像播放，web terminal hang住bug
```
  fcb3fd71