Commits · c89d43d26946c5fb5ffda92ed1211df49aa3822a · ops / jumpserver

22 Nov, 2015 8 commits
- update, now Mac to develop will be all egg pain · c89d43d2
  liuzheng712 authored Nov 22, 2015
  
  c89d43d2
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ · 962d1617
  liuzheng712 authored Nov 22, 2015
  
  962d1617
- update connect.py · 5f9e675d
  kelianchun_miller authored Nov 22, 2015
  
  5f9e675d
- update connect.py · c359d1e2
  kelianchun_miller authored Nov 22, 2015
  
  c359d1e2
- update connect.py · 0c42d039
  kelianchun_miller authored Nov 22, 2015
  
  0c42d039
- update connect.py · 55503c89
  kelianchun_miller authored Nov 22, 2015
  
  55503c89
- 修改gen_resource api · a143797a
  ibuler authored Nov 22, 2015
  
  a143797a
- index show assets, need discussion · 09de12c0
  liuzheng712 authored Nov 22, 2015
  
  09de12c0
21 Nov, 2015 12 commits
- http://localhost:8000/juser/user_detail/?id=5001 fix · 246e8770
  liuzheng712 authored Nov 21, 2015
  
  246e8770
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ · ea059790
  liuzheng712 authored Nov 21, 2015
  
  ea059790
- update · 6ae49075
  liuzheng712 authored Nov 21, 2015
  
  6ae49075
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · 5f768444
  ibuler authored Nov 21, 2015
  
  5f768444
- 完成登陆，批量执行命令流 · 93481a98
  ibuler authored Nov 21, 2015
  
  93481a98
- merge cmdb · 0ebb7c4f
  wangyong authored Nov 21, 2015
  
  0ebb7c4f
- alert ip -> hostname · 652ea98a
  wangyong authored Nov 21, 2015
  
  652ea98a
- 添加api注释 · 87738367
  ibuler authored Nov 21, 2015
  
  87738367
- 添加资产权限查询，添加生成resource文件api · e041a49a
  ibuler authored Nov 21, 2015
  
  e041a49a
- 完成授权查询api · dc06426a
  ibuler authored Nov 21, 2015
  
  dc06426a
- 用户和组查询api完成 · 1478ac18
  ibuler authored Nov 21, 2015
  
  1478ac18
- 添加授权查询api · 55830959
  ibuler authored Nov 20, 2015
  
  55830959
20 Nov, 2015 13 commits
- Merge branch 'exec_cmd' into dev · 40d1eb37
  ibuler authored Nov 20, 2015
  
  40d1eb37
- 删除遗留的model SysUser PermLog · b8d6c5d0
  ibuler authored Nov 20, 2015
  
  b8d6c5d0
- bug fix · 85a9da0e
  ibuler authored Nov 20, 2015
  
  85a9da0e
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · faa02757
  ibuler authored Nov 20, 2015
  
  faa02757
- 定义通用模块执行 · eea56ea0
  ibuler authored Nov 20, 2015
  
  eea56ea0
- 定义Command前 · ab313aac
  ibuler authored Nov 20, 2015
  
  ab313aac
- 1. 在授权规则添加页面　通过js 给予用户输入提醒 · a88ee072
  yumaojun authored Nov 20, 2015
  
  a88ee072
- 登陆web的密码（如不修改请留空） · f863f4b7
  liuzheng712 authored Nov 20, 2015
  
  f863f4b7
- confirm alert · 4bbae381
  liuzheng712 authored Nov 20, 2015
  
  4bbae381
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ · 31807b67
  liuzheng712 authored Nov 20, 2015
  
  31807b67
- annotation the Asset · 75fbd9e6
  liuzheng712 authored Nov 20, 2015
  
  75fbd9e6
- group add and remove fixed · 42ec624a
  liuzheng712 authored Nov 20, 2015
  
  42ec624a
- batch asset alert · b4c13069
  halcyon authored Nov 19, 2015
  
  b4c13069
19 Nov, 2015 6 commits
- 一些js, setting的KEY_DIR, 下载秘钥鉴定 · 6b1b3348
  ibuler authored Nov 19, 2015
  
  6b1b3348
- merge cmdb and hehe · 1471e0a2
  halcyon authored Nov 19, 2015
  
  1471e0a2
- Merge branch 'cmdb' into dev · a04bb100
  halcyon authored Nov 19, 2015
  
  a04bb100
- fix bugs · f9b1d305
  halcyon authored Nov 19, 2015
  
  f9b1d305
- merge with exec_cmd · bddb689e
  ibuler authored Nov 19, 2015
  
  bddb689e
- update merge conflict. · 757f7bee
  yumaojun authored Nov 19, 2015
  
  757f7bee
18 Nov, 2015 1 commit
- 1. 更新和添加（role 和 rule )操作以 msg 的方式刷新页面 · 6582ee16
  yumaojun authored Nov 18, 2015
  
  6582ee16