Commits · 2c0d42e0da43e0a446d2c577003334670e5d6842 · ops / jumpserver

25 Nov, 2015 7 commits
- fix some bug · 2c0d42e0
  ibuler authored Nov 25, 2015
  
  2c0d42e0
- fix rule js bug · 0335bc26
  ibuler authored Nov 25, 2015
  
  0335bc26
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · 60166ac0
  ibuler authored Nov 25, 2015
  
  60166ac0
- 角色key问题修复 · f760df1e
  ibuler authored Nov 25, 2015
  
  f760df1e
- 角色key问题修复 · 6fe6342c
  ibuler authored Nov 25, 2015
  
  6fe6342c
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ · 175f2702
  liuzheng712 authored Nov 25, 2015
  
  175f2702
- Merge branch 'exec_cmd' into dev · a7db713b
  ibuler authored Nov 25, 2015
  
  a7db713b
24 Nov, 2015 14 commits
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · 742e56fc
  wangyong authored Nov 24, 2015
  
  742e56fc
- fix disk detail bug · 0262d94d
  wangyong authored Nov 24, 2015
  
  0262d94d
- 修改setting字段 · 32d036c2
  ibuler authored Nov 24, 2015
  
  32d036c2
- fix bug · 1a63d32f
  ibuler authored Nov 24, 2015
  
  1a63d32f
- fix bug · ec9b00e2
  ibuler authored Nov 24, 2015
  
  ec9b00e2
- Merge branch 'exec_cmd' into dev · d7cb549e
  ibuler authored Nov 24, 2015
  
  d7cb549e
- fix · 168157bf
  ibuler authored Nov 24, 2015
  
  168157bf
- fix bug · 7cbb7718
  ibuler authored Nov 24, 2015
  
  7cbb7718
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · 2d65265f
  ibuler authored Nov 24, 2015
  
  2d65265f
- fix websocket授权 · 30fe9f52
  ibuler authored Nov 24, 2015
  
  30fe9f52
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · 49821062
  wangyong authored Nov 24, 2015
  
  49821062
- add update all button · 99439be0
  wangyong authored Nov 24, 2015
  
  99439be0
- fix 加密bug · 17ccac92
  ibuler authored Nov 24, 2015
  
  17ccac92
- Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb · dd4c243d
  wangyong authored Nov 24, 2015
  
  dd4c243d
23 Nov, 2015 10 commits
- fix bugs · 34031bfd
  halcyon authored Nov 23, 2015
  
  34031bfd
- fix bug · a7a030fe
  ibuler authored Nov 23, 2015
  
  a7a030fe
- fix some bug · 4c505512
  ibuler authored Nov 23, 2015
  
  4c505512
- 资产列表添加连接 · 483ca967
  ibuler authored Nov 23, 2015
  
  483ca967
- Merge branch 'dev' into exec_cmd · f00a2e00
  ibuler authored Nov 23, 2015
  
  f00a2e00
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · 0b878216
  ibuler authored Nov 23, 2015
  
  0b878216
- webscoket授权 · f49a92e7
  ibuler authored Nov 23, 2015
  
  f49a92e7
- update connect.py · ee218a5f
  kelianchun_miller authored Nov 23, 2015
  
  ee218a5f
- merge cmdb | add asset update batch and crontab · a9196ef1
  wangyong authored Nov 23, 2015
  
  a9196ef1
- Merge branch 'cmdb' into dev · 04bf37b5
  wangyong authored Nov 23, 2015
  
  04bf37b5
22 Nov, 2015 9 commits
- asset update batch and crontab · 5a3c11f6
  wangyong authored Nov 22, 2015
  
  5a3c11f6
- update, now Mac to develop will be all egg pain · c89d43d2
  liuzheng712 authored Nov 22, 2015
  
  c89d43d2
- Merge branch 'dev' into exec_cmd · 12f33176
  ibuler authored Nov 22, 2015
  
  12f33176
- 修改run_websocket · eb779e5b
  ibuler authored Nov 22, 2015
  
  eb779e5b
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · 47ace5d6
  ibuler authored Nov 22, 2015
  
  47ace5d6
- global SSH_FLAG to self.ssh_flag · 70db8c69
  ibuler authored Nov 22, 2015
  
  70db8c69
- 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
- 添加注释 · 4cdc7f33
  ibuler authored Nov 22, 2015
  
  4cdc7f33