Commits · 0.2.0 · ops / jumpserver

20 Apr, 2015 9 commits
- modify readme · 8f7e1bfc
  ibuler authored Apr 20, 2015
  
  8f7e1bfc
- ӽű · 7accf70e
  ibuler authored Apr 20, 2015
  
  7accf70e
- resolve confilict · e2ac212f
  ibuler authored Apr 20, 2015
  
  e2ac212f
- fix a bug · 09d3763a
  ibuler authored Apr 20, 2015
  
  09d3763a
- django 1.6 · ea37374e
  ibuler authored Apr 20, 2015
  
  ea37374e
- Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver · a203b89a
  ibuler authored Apr 20, 2015
  
  a203b89a
- ޸Ƴbug · 0a8198b2
  ibuler authored Apr 20, 2015
  
  0a8198b2
- ޸Ƴbug · d84ff970
  ibuler authored Apr 20, 2015
  
  d84ff970
- version 2.0.0 beta · 412dadce
  ibuler authored Apr 20, 2015
  
  412dadce
19 Apr, 2015 6 commits
- hehe · b65f620f
  halcyon authored Apr 19, 2015
  
  b65f620f
- merge with wangyong · 8b50e525
  ibuler authored Apr 19, 2015
  
  8b50e525
- Խűȥע · 76b1bf2c
  ibuler authored Apr 19, 2015
  
  76b1bf2c
- last bug? · 86e334e4
  halcyon authored Apr 19, 2015
  
  86e334e4
- ޸һbug · 17e89bb5
  ibuler authored Apr 19, 2015
  
  17e89bb5
- 添加授权详情页，并添加用户详情页链接到授权列表 · d5fba23d
  ibuler authored Apr 18, 2015
  
  d5fba23d
18 Apr, 2015 13 commits
- ޸ · e96053ba
  ibuler authored Apr 18, 2015
  
  e96053ba
- Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver · c8d91884
  ibuler authored Apr 18, 2015
```
Conflicts:
	jumpserver/api.py
```
  c8d91884
- hehe · bd2d7ce0
  halcyon authored Apr 18, 2015
  
  bd2d7ce0
- --broken encoding: IBM420_ltr · 6d6e9d97
  ibuler authored Apr 18, 2015
  
  6d6e9d97
- merge · 9ab855fd
  ibuler authored Apr 18, 2015
  
  9ab855fd
- ϲ · c1d8de45
  ibuler authored Apr 18, 2015
  
  c1d8de45
- bug · f19b274f
  halcyon authored Apr 18, 2015
  
  f19b274f
- Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei · 0873211d
  ibuler authored Apr 18, 2015
  
  0873211d
- ӳɹҳ · bcc57743
  ibuler authored Apr 18, 2015
  
  bcc57743
- bug · 84929840
  halcyon authored Apr 18, 2015
  
  84929840
- merge · d6171f7f
  ibuler authored Apr 18, 2015
  
  d6171f7f
- ɾûõ · 9acba2dd
  ibuler authored Apr 18, 2015
  
  9acba2dd
- bug · 75e1ea7f
  halcyon authored Apr 18, 2015
  
  75e1ea7f
17 Apr, 2015 1 commit
- --broken encoding: IBM420_ltr · 4f1b4f19
  ibuler authored Apr 17, 2015
  
  4f1b4f19
16 Apr, 2015 8 commits
- 优化 · a269c43d
  halcyon authored Apr 16, 2015
  
  a269c43d
- Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei · 83938e10
  ibuler authored Apr 16, 2015
  
  83938e10
- ޸ļ · 0d1d64e8
  ibuler authored Apr 16, 2015
  
  0d1d64e8
- bugs · 75c8e445
  halcyon authored Apr 16, 2015
  
  75c8e445
- Merge branch 'master' into wangyong · 29d19641
  halcyon authored Apr 16, 2015
  
  29d19641
- Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver · e2e13114
  ibuler authored Apr 16, 2015
  
  e2e13114
- --broken encoding: IBM420_ltr · 60cb5561
  ibuler authored Apr 16, 2015
  
  60cb5561
- hehe · 55c5230e
  halcyon authored Apr 16, 2015
  
  55c5230e
15 Apr, 2015 3 commits
- bugs · da4d6b85
  halcyon authored Apr 15, 2015
  
  da4d6b85
- û · c08cee80
  guanghongwei authored Apr 15, 2015
  
  c08cee80
- --broken encoding: IBM420_ltr · 3424bef5
  guanghongwei authored Apr 15, 2015
  
  3424bef5