Commits · 4397819b44c311aebcb602845d789ef48f654239 · ops / jumpserver

17 Nov, 2015 8 commits
- user.update bug fix · 4397819b
  liuzheng712 authored Nov 17, 2015
  
  4397819b
- bug of user.update · ee443361
  liuzheng712 authored Nov 17, 2015
  
  ee443361
- user.update · 1c3b66c1
  liuzheng712 authored Nov 17, 2015
  
  1c3b66c1
- user.update · a99f024d
  liuzheng712 authored Nov 17, 2015
  
  a99f024d
- user.update · 738c6353
  liuzheng712 authored Nov 17, 2015
  
  738c6353
- user.update · adf20f18
  liuzheng712 authored Nov 17, 2015
  
  adf20f18
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ · b9b96575
  liuzheng712 authored Nov 17, 2015
  
  b9b96575
- merge_dev · 036873e1
  liuzheng712 authored Nov 17, 2015
  
  036873e1
16 Nov, 2015 12 commits
- deal_command添加到静态方法中 · ce02d430
  ibuler authored Nov 16, 2015
  
  ce02d430
- 添加jumpserver.conf · 4abf2b06
  ibuler authored Nov 16, 2015
  
  4abf2b06
- 恢复修改前 · 2d27e3fe
  ibuler authored Nov 16, 2015
  
  2d27e3fe
- key目录变化 · 67771105
  ibuler authored Nov 16, 2015
  
  67771105
- select all · de9ce6dd
  liuzheng712 authored Nov 16, 2015
  
  de9ce6dd
- Merge branch 'dev' of git.coding.net:jumpserver/Jumpserver into dev · 71ef4b07
  ibuler authored Nov 16, 2015
  
  71ef4b07
- 修复分页bug · f0d901e1
  ibuler authored Nov 16, 2015
  
  f0d901e1
- update · d3dd9d94
  liuzheng712 authored Nov 16, 2015
  
  d3dd9d94
- update · 2938f7e5
  liuzheng712 authored Nov 16, 2015
  
  2938f7e5
- merge · 1f5fa9a9
  liuzheng712 authored Nov 16, 2015
  
  1f5fa9a9
- udpate · 96ac65b3
  liuzheng712 authored Nov 16, 2015
  
  96ac65b3
- app jperm role and rule bug fixed... · c00e4c24
  yumaojun authored Nov 16, 2015
  
  c00e4c24
15 Nov, 2015 12 commits
- add asset ok ,pull · 844fe2c2
  yumaojun authored Nov 15, 2015
  
  844fe2c2
- merge dev ... · 6da97c54
  yumaojun authored Nov 15, 2015
  
  6da97c54
- fix merge bug · 1e41b796
  wangyong authored Nov 15, 2015
  
  1e41b796
- asset js · 5d334932
  ibuler authored Nov 15, 2015
  
  5d334932
- 暂时去掉普通用户的get.asset · 38c65dbe
  ibuler authored Nov 15, 2015
  
  38c65dbe
- merge ... · 218ba0d1
  yumaojun authored Nov 15, 2015
  
  218ba0d1
- new map · a36294a5
  yumaojun authored Nov 15, 2015
  
  a36294a5
- 解决分页bug，和random_pass · 333ee713
  广宏伟 authored Nov 15, 2015
  
  333ee713
- some bug fix · b8ae0ed5
  广宏伟 authored Nov 15, 2015
  
  b8ae0ed5
- merge with cmdb · 3b07198b
  ibuler authored Nov 15, 2015
  
  3b07198b
- 1. role push function use password and public key completed · 8b94833e
  yumaojun authored Nov 15, 2015
  
  8b94833e
- merge map · 0862ffef
  yumaojun authored Nov 15, 2015
  
  0862ffef
14 Nov, 2015 8 commits
- update models · 95dc12a7
  yumaojun authored Nov 14, 2015
  
  95dc12a7
- asset add batch · 0f29745b
  wangyong authored Nov 14, 2015
  
  0f29745b
- merge update... · 012950cb
  yumaojun authored Nov 14, 2015
  
  012950cb
- 修改变量命名 · f9c06c22
  ibuler authored Nov 14, 2015
  
  f9c06c22
- 1. update role push · 83c2704d
  yumaojun authored Nov 14, 2015
  
  83c2704d
- 1. rule push page completed · 74b6b4de
  yumaojun authored Nov 14, 2015
  
  74b6b4de
- 1. rule operations list add delete edit info page compeleted · f6bc0332
  yumaojun authored Nov 14, 2015
```
2. rule operations list add delete edit info page compeleted
```
  f6bc0332
- update connect.py · 3d4443e1
  kelianchun_miller authored Nov 14, 2015
```
命令处理进一步处理
```
  3d4443e1