Commits · 375a2431319f296cb572551a003ed367a01f50b4 · ops / jumpserver

17 Nov, 2015 21 commits
- Merge remote-tracking branch 'origin/map_perm' into dev · 375a2431
  yumaojun authored Nov 17, 2015
  
  375a2431
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · 70e6904e
  yumaojun authored Nov 17, 2015
  
  70e6904e
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · 42745c52
  ibuler authored Nov 17, 2015
  
  42745c52
- 更换nav ico, 修复需要登陆，登陆后跳转到登陆前页面 · 8479989e
  ibuler authored Nov 17, 2015
  
  8479989e
- fix when ./keys/user/ didn't exist bug · ee7675f7
  liuzheng712 authored Nov 17, 2015
  
  ee7675f7
- url · 37b91c40
  liuzheng712 authored Nov 17, 2015
  
  37b91c40
- user delete with alert confirm · 4027a87e
  liuzheng712 authored Nov 17, 2015
  
  4027a87e
- juser/change_info/ fix password can be ignore · 84992746
  liuzheng712 authored Nov 17, 2015
  
  84992746
- user.update bug fix · 4397819b
  liuzheng712 authored Nov 17, 2015
  
  4397819b
- bug of user.update · ee443361
  liuzheng712 authored Nov 17, 2015
  
  ee443361
- Merge branch 'dev' into map_perm · e5c10710
  yumaojun authored Nov 17, 2015
  
  e5c10710
- update role edit and rule edit · 8d941dc0
  yumaojun authored Nov 17, 2015
  
  8d941dc0
- 1. update role and update rule complete. · 11f6939b
  yumaojun authored Nov 17, 2015
  
  11f6939b
- user.update · 1c3b66c1
  liuzheng712 authored Nov 17, 2015
  
  1c3b66c1
- user.update · a99f024d
  liuzheng712 authored Nov 17, 2015
  
  a99f024d
- 添加ignore · d58ba823
  ibuler authored Nov 17, 2015
  
  d58ba823
- user.update · 738c6353
  liuzheng712 authored Nov 17, 2015
  
  738c6353
- 修正文件目录 · dc547de5
  ibuler authored Nov 17, 2015
  
  dc547de5
- 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 13 commits
- 1. push role bug , because the password push is mandatory, so just the push key is option. · 9d36dc9e
  yumaojun authored Nov 16, 2015
  
  9d36dc9e
- 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 6 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