Commits · c1d8de455827a8d4f51a388e0f920160e0528930 · ops / jumpserver

18 Apr, 2015 7 commits
- ϲ · c1d8de45
  ibuler authored Apr 18, 2015
  
  c1d8de45
- 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
14 Apr, 2015 3 commits
- bug · e72e30bc
  halcyon authored Apr 14, 2015
  
  e72e30bc
- bug · 99293cc0
  halcyon authored Apr 14, 2015
  
  99293cc0
- bugs · 3bfe0e3c
  halcyon authored Apr 14, 2015
  
  3bfe0e3c
13 Apr, 2015 1 commit
- hehe · 4abf25ef
  halcyon authored Apr 13, 2015
  
  4abf25ef
11 Apr, 2015 8 commits
- Merge branch 'master' into wangyong · e385f3e0
  halcyon authored Apr 11, 2015
  
  e385f3e0
- idc · a4bd3524
  halcyon authored Apr 11, 2015
  
  a4bd3524
- reslove · 6a565d0a
  guanghongwei authored Apr 11, 2015
  
  6a565d0a
- hehe · 2e254af9
  root authored Apr 11, 2015
  
  2e254af9
- ޸ · 12df8cf0
  guanghongwei authored Apr 11, 2015
  
  12df8cf0
- Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver · 3c1af0e2
  guanghongwei authored Apr 11, 2015
  
  3c1af0e2
- ޸ĸbug · 3b00cfa9
  guanghongwei authored Apr 11, 2015
  
  3b00cfa9
- hehe · 9cfe6c56
  halcyon authored Apr 11, 2015
  
  9cfe6c56
09 Apr, 2015 6 commits
- ϴļ · 78f00e5c
  guanghongwei authored Apr 09, 2015
  
  78f00e5c
- upload and resove · 30fd1600
  guanghongwei authored Apr 09, 2015
  
  30fd1600
- hehe · 3842f779
  halcyon authored Apr 09, 2015
  
  3842f779
- Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei · 419ee266
  guanghongwei authored Apr 09, 2015
```
Conflicts:
	jumpserver/urls.py
	jumpserver/views.py
```
  419ee266
- ϴ · ff77cc28
  guanghongwei authored Apr 09, 2015
  
  ff77cc28
- bugs · d28d72c4
  halcyon authored Apr 09, 2015
  
  d28d72c4
08 Apr, 2015 3 commits
- ޸ҳ · 2b14fefb
  guanghongwei authored Apr 08, 2015
  
  2b14fefb
- Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver · 25ce24a1
  guanghongwei authored Apr 08, 2015
```
Conflicts:
	jasset/views.py
	jumpserver/views.py
```
  25ce24a1
- Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver · b840db12
  guanghongwei authored Apr 08, 2015
```
Conflicts:
	jasset/views.py
	jumpserver/views.py
```
  b840db12