Commits · 05f80f743ba6ab9e15a38bf7491d5ee3acad5d00 · ops / jumpserver

14 Dec, 2015 10 commits
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · 05f80f74
  yumaojun authored Dec 14, 2015
  
  05f80f74
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · f2495098
  wangyong authored Dec 14, 2015
  
  f2495098
- alert idc|group length · c6e0b200
  wangyong authored Dec 14, 2015
  
  c6e0b200
- asset udpate url bug · 2496f1c6
  ibuler authored Dec 14, 2015
  
  2496f1c6
- fix del role url bug · 1a32fb5d
  ibuler authored Dec 14, 2015
  
  1a32fb5d
- fix log kill and asset detail bug · be2f0b21
  ibuler authored Dec 14, 2015
  
  be2f0b21
- fix asset upload bug · 5e5aab79
  ibuler authored Dec 14, 2015
  
  5e5aab79
- fix group list bug · a8bdc377
  ibuler authored Dec 14, 2015
  
  a8bdc377
- 修改jumpserver.conf注释 · 3260584f
  广宏伟 authored Dec 14, 2015
  
  3260584f
- role fix to sys user · b58ff14e
  ibuler authored Dec 14, 2015
  
  b58ff14e
12 Dec, 2015 6 commits
- 主机组列表编辑连接修改 · db13b7a3
  ibuler authored Dec 12, 2015
  
  db13b7a3
- bug fix · 3150461d
  ibuler authored Dec 12, 2015
  
  3150461d
- bug fix · 97bfbe24
  ibuler authored Dec 12, 2015
  
  97bfbe24
- bug fix · 30b5f74c
  ibuler authored Dec 12, 2015
  
  30b5f74c
- bug fix · 69aba464
  ibuler authored Dec 12, 2015
  
  69aba464
- url modify · f849ffef
  ibuler authored Dec 12, 2015
  
  f849ffef
11 Dec, 2015 9 commits
- open in current window · 6d5513c6
  ibuler authored Dec 11, 2015
  
  6d5513c6
- bug fix · b27e2075
  ibuler authored Dec 11, 2015
  
  b27e2075
- bugfix · 9979fdf6
  ibuler authored Dec 11, 2015
  
  9979fdf6
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · b655b064
  yumaojun authored Dec 11, 2015
  
  b655b064
- fixed rule and role detail page not id bug · 974619d1
  yumaojun authored Dec 11, 2015
  
  974619d1
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · 280560f2
  ibuler authored Dec 11, 2015
  
  280560f2
- fix none bug · 7ce12af1
  wangyong authored Dec 11, 2015
  
  7ce12af1
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · ba955df4
  ibuler authored Dec 11, 2015
  
  ba955df4
- bug fix · 34cbb13b
  ibuler authored Dec 11, 2015
  
  34cbb13b
10 Dec, 2015 15 commits
- fixed perm page · aa262d04
  yumaojun authored Dec 10, 2015
  
  aa262d04
- 修复了rule 和 role　的detail 页面 · 4294ecaf
  yumaojun authored Dec 10, 2015
  
  4294ecaf
- bug fix · 014d0935
  ibuler authored Dec 10, 2015
  
  014d0935
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · e65cad50
  ibuler authored Dec 10, 2015
  
  e65cad50
- 修复了rule 和 role　的detail 页面 · b0f2b346
  yumaojun authored Dec 10, 2015
  
  b0f2b346
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · affd9aad
  ibuler authored Dec 10, 2015
  
  affd9aad
- bug fix · 23051a4a
  ibuler authored Dec 10, 2015
  
  23051a4a
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · e9fe871a
  yumaojun authored Dec 10, 2015
  
  e9fe871a
- update... · 80b1bda5
  yumaojun authored Dec 10, 2015
  
  80b1bda5
- Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev · e117cd00
  ibuler authored Dec 10, 2015
  
  e117cd00
- defend attack · e03b4722
  ibuler authored Dec 10, 2015
  
  e03b4722
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · b5a3fb44
  yumaojun authored Dec 09, 2015
  
  b5a3fb44
- Merge branch 'map_perm' into dev · 4903a171
  yumaojun authored Dec 09, 2015
```
# Conflicts:
#	jperm/ansible_api.py
#	jperm/views.py
```
  4903a171
- Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev · a0684985
  yumaojun authored Dec 09, 2015
```
# Conflicts:
#	jperm/ansible_api.py
```
  a0684985
- fix bugs · 1a3541e5
  halcyon authored Dec 09, 2015
  
  1a3541e5