Commits · 244d0d2ba419f43d890058b5a6d4e91bc1f5d18c · ops / jumpserver

21 Jan, 2015 8 commits
- Merge branch 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei · 244d0d2b
  root authored Jan 21, 2015
```
Conflicts:
	jumpserver/templatetags/mytags.py
	juser/views.py
```
  244d0d2b
- bug消除 · d878bb19
  ibuler authored Jan 21, 2015
  
  d878bb19
- 修改bug · 6bd0ed43
  ibuler authored Jan 21, 2015
  
  6bd0ed43
- 修改bug · 6635ccb6
  ibuler authored Jan 21, 2015
  
  6635ccb6
- 查看实例 · a0688274
  ibuler authored Jan 21, 2015
  
  a0688274
- 修改bug · c569afb5
  ibuler authored Jan 21, 2015
  
  c569afb5
- 获得role tag · b0196461
  ibuler authored Jan 21, 2015
  
  b0196461
- 修改添加组不选没有提示bug · 9b194946
  halcyon authored Jan 21, 2015
  
  9b194946
19 Jan, 2015 1 commit
- 资产管理页面基本完成，尚有部分小bug · 7863a685
  halcyon authored Jan 19, 2015
  
  7863a685
14 Jan, 2015 6 commits
- 修改bug · 46720dcf
  ibuler authored Jan 14, 2015
  
  46720dcf
- 添加用户列表 · f592e464
  ibuler authored Jan 14, 2015
  
  f592e464
- 添加用户列表 · 2200783d
  ibuler authored Jan 14, 2015
  
  2200783d
- 修改添加用户bug · 8a1e5376
  ibuler authored Jan 14, 2015
  
  8a1e5376
- 增加js判断 · 1925cf40
  halcyon authored Jan 14, 2015
  
  1925cf40
- 资产详情弹窗 · 6b95c7ed
  halcyon authored Jan 14, 2015
  
  6b95c7ed
13 Jan, 2015 4 commits
- 修改添加用户bug · 7435d602
  ibuler authored Jan 13, 2015
  
  7435d602
- 修改bug · 2b6c2cd6
  ibuler authored Jan 13, 2015
  
  2b6c2cd6
- 修改bug · 84a48d3a
  ibuler authored Jan 13, 2015
  
  84a48d3a
- 添加用户完成 · 14da0f18
  ibuler authored Jan 13, 2015
  
  14da0f18
12 Jan, 2015 1 commit
- 添加useradd的函数 · bc5b32bc
  ibuler authored Jan 12, 2015
  
  bc5b32bc
11 Jan, 2015 1 commit
- 资产管理页面基本完成. · acf508f0
  halcyon authored Jan 11, 2015
  
  acf508f0
10 Jan, 2015 19 commits
- 修改默认 · f45398e2
  ibuler authored Jan 10, 2015
  
  f45398e2
- 添加自定义tag · 9304a911
  ibuler authored Jan 10, 2015
  
  9304a911
- --broken encoding: IBM420_ltr · fbde8d42
  guanghongwei authored Jan 10, 2015
  
  fbde8d42
- --broken encoding: IBM420_ltr · 8875cb2f
  guanghongwei authored Jan 10, 2015
  
  8875cb2f
- Ĭֵ · 8c9e763f
  guanghongwei authored Jan 10, 2015
  
  8c9e763f
- Locals · 97dcb4ca
  guanghongwei authored Jan 10, 2015
  
  97dcb4ca
- --broken encoding: IBM420_ltr · 95fb1bfd
  guanghongwei authored Jan 10, 2015
  
  95fb1bfd
- --broken encoding: IBM420_ltr · 8b91d577
  guanghongwei authored Jan 10, 2015
  
  8b91d577
- --broken encoding: IBM420_ltr · ae227aad
  guanghongwei authored Jan 10, 2015
  
  ae227aad
- --broken encoding: IBM420_ltr · 3a3c5701
  guanghongwei authored Jan 10, 2015
  
  3a3c5701
- --broken encoding: IBM420_ltr · 56fe39d3
  guanghongwei authored Jan 10, 2015
  
  56fe39d3
- --broken encoding: IBM420_ltr · b3444d23
  guanghongwei authored Jan 10, 2015
  
  b3444d23
- ݿû · f7a54e13
  guanghongwei authored Jan 10, 2015
  
  f7a54e13
- --broken encoding: IBM420_ltr · 796533b7
  guanghongwei authored Jan 10, 2015
  
  796533b7
- Merge branch 'master' into guanghongwei · f9abf7af
  guanghongwei authored Jan 10, 2015
  
  f9abf7af
- ޸jasset · e5fe1333
  guanghongwei authored Jan 10, 2015
  
  e5fe1333
- a new branch · 94beae52
  root authored Jan 10, 2015
  
  94beae52
- ޸ · 65b29cb6
  guanghongwei authored Jan 10, 2015
  
  65b29cb6
- ޸model · c6e04295
  guanghongwei authored Jan 10, 2015
  
  c6e04295