Commits · ae58fd548fc57f1cc91bb5549cb71dd7ba35aa09 · ops / jumpserver

24 Mar, 2016 4 commits
- 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 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
23 Mar, 2016 12 commits
- Merge pull request #154 from jumpserver/term_log_bug · 6d302eb2
  ibuler authored Mar 23, 2016
```
fix: command recoder bug fix
```
  6d302eb2
- 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 7 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
- Merge pull request #138 from jumpserver/role_pass_long_bug · b6af8368
  ibuler authored Mar 21, 2016
```
修复系统用户role密码过长引起的异常
```
  b6af8368
- fix(perm_role_edit) 修复编辑系统用户密码过长bug · 6e4b2918
  ibuler authored Mar 21, 2016
```
1. 添加前端验证

close #173
```
  6e4b2918
- fix(perm_role_add) 修复添加系统用户密码过长导致的异常bug · 4c88ea3c
  ibuler authored Mar 21, 2016
```
1. 修改表结构password长度
2. 修改template添加js验证
```
  4c88ea3c
19 Mar, 2016 1 commit

Merge pull request #129 from jumpserver/bug_fix_100_and_127 · 0e5fd68e

ibuler authored Mar 19, 2016

fix (jperm):   统一调整系统用户 仅使用秘钥进行通信， 已存在的用户不会修改密码

0e5fd68e

18 Mar, 2016 14 commits
- len(vim_data) · 1103ee8f
  liuzheng712 authored Mar 18, 2016
  
  1103ee8f
- len(vim_data) · 9efa9e97
  liuzheng712 authored Mar 18, 2016
  
  9efa9e97
- Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix · f331b447
  liuzheng712 authored Mar 18, 2016
  
  f331b447
- Merge pull request #136 from kelianchun/dev · f11016f5
  kelianchun authored Mar 18, 2016
```
pull issue #120
```
  f11016f5
- Merge pull request #1 from jumpserver/dev · 4b53bae5
  Astraeux authored Mar 18, 2016
```
update from origin
```
  4b53bae5
- pull issue #120 · b2ccbc3f
  kelianchun_miller authored Mar 18, 2016
  
  b2ccbc3f
- pull issue #120 · 7dcf050d
  kelianchun_miller authored Mar 18, 2016
  
  7dcf050d
- Merge remote-tracking branch 'remotes/origin/master' into dev · 717869fd
  kelianchun_miller authored Mar 18, 2016
  
  717869fd
- pull issue #120 · 598d6cff
  kelianchun_miller authored Mar 18, 2016
  
  598d6cff
- Merge branch 'dev' of github.com:jumpserver/jumpserver into issue_52_bugfix · c022c811
  liuzheng712 authored Mar 18, 2016
  
  c022c811
- delete_require_chardet · 5af9dd65
  liuzheng712 authored Mar 18, 2016
  
  5af9dd65
- Merge pull request #122 from jumpserver/bug_fix_80 · abdf9c72
  ibuler authored Mar 18, 2016
```
fix (jasset): 　修复连接超时，以及freebsd无法更新硬件信息
```
  abdf9c72
- Merge pull request #134 from kelianchun/dev · 3778724b
  ibuler authored Mar 18, 2016
```
修复命令截取bug
```
  3778724b
- pull issue #120 · d76865c1
  kelianchun authored Mar 18, 2016
```
修复了命令处理的bug
```
  d76865c1