Commits · 409fac3ef1955a26092b6c00dfb1bdc7c9feeee6 · ops / jumpserver

08 Sep, 2016 7 commits
- Merge branch 'admin-user' · 409fac3e
  ibuler authored Sep 08, 2016
  
  409fac3e
- Finish admin user view · 239dd056
  ibuler authored Sep 08, 2016
  
  239dd056
- fix #9 · 62cac20b
  xiaokong1937@gmail.com authored Sep 08, 2016
  
  62cac20b
- Finish adin user add · ff30435e
  ibuler authored Sep 08, 2016
  
  ff30435e
- Stash it · 5a0b1194
  ibuler authored Sep 07, 2016
  
  5a0b1194
- Merge branch 'admin-user' · ccfe9b9d
  ibuler authored Sep 07, 2016
  
  ccfe9b9d
- Add admin user list view · 6f4a8323
  ibuler authored Sep 07, 2016
  
  6f4a8323
07 Sep, 2016 6 commits
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · 8acbcb2e
  xiaokong1937@gmail.com authored Sep 07, 2016
  
  8acbcb2e
- user group quickedit frontend and rest API · 04151b99
  xiaokong1937@gmail.com authored Sep 07, 2016
  
  04151b99
- modify idc · dfc628a3
  ibuler authored Sep 07, 2016
  
  dfc628a3
- Add idc · 4db352f5
  ibuler authored Sep 07, 2016
  
  4db352f5
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · d8e64334
  ibuler authored Sep 07, 2016
  
  d8e64334
- Finish asset group create · d0ba1737
  ibuler authored Sep 07, 2016
  
  d0ba1737
06 Sep, 2016 13 commits
- user-group edit serializer and url implement · 7f09b486
  xiaokong1937@gmail.com authored Sep 06, 2016
  
  7f09b486
- Asset group detail · 30fd51c2
  ibuler authored Sep 06, 2016
  
  30fd51c2
- refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes · 556fb4e0
  xiaokong1937@gmail.com authored Sep 06, 2016
  
  556fb4e0
- Merge branch 'xiaoyu' · a3096689
  xiaokong1937@gmail.com authored Sep 06, 2016
  
  a3096689
- Forget to forgot · dc01833a
  ibuler authored Sep 06, 2016
  
  dc01833a
- change date_added -> date_created · 170b4942
  ibuler authored Sep 06, 2016
  
  170b4942
- temp commit · c6f875c5
  xiaoyu authored Sep 06, 2016
  
  c6f875c5
- Reslove conflict · 07dd6d11
  ibuler authored Sep 06, 2016
  
  07dd6d11
- Merge with cmdb · 25d9dbe9
  ibuler authored Sep 06, 2016
  
  25d9dbe9
- move login and logout view back to CBV · 8cc09f0e
  xiaoyu authored Sep 06, 2016
  
  8cc09f0e
- Update add->create edit->update and assetgrou->asset-grou etc format · 02b5483d
  ibuler authored Sep 06, 2016
  
  02b5483d
- Add assetgroup form save action · b8c10a03
  ibuler authored Sep 05, 2016
  
  b8c10a03
- Add asset group add Form m2m · 126d7fd6
  ibuler authored Sep 05, 2016
  
  126d7fd6
05 Sep, 2016 11 commits
- Modify some bug · 3c6f50b7
  ibuler authored Sep 05, 2016
  
  3c6f50b7
- set textarea rows · 2cb6b15b
  ibuler authored Sep 05, 2016
  
  2cb6b15b
- Modify asset model · 2f5b7ad6
  ibuler authored Sep 05, 2016
  
  2f5b7ad6
- fix small template erros · 6aedfb52
  xiaokong1937@gmail.com authored Sep 05, 2016
  
  6aedfb52
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · 397da7d6
  xiaokong1937@gmail.com authored Sep 05, 2016
  
  397da7d6
- fix captcha not valid bug of login view; use django's default login and logout… · e75d3343
  xiaokong1937@gmail.com authored Sep 05, 2016
```
fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness
```
  e75d3343
- Update nav · 7241f750
  ibuler authored Sep 05, 2016
  
  7241f750
- Modify translation · 8827fd2d
  ibuler authored Sep 05, 2016
  
  8827fd2d
- Update initial data: fixtures dir · 6fc3bbb9
  ibuler authored Sep 05, 2016
  
  6fc3bbb9
- Modify form datetime valid error, because form format · 508bda37
  ibuler authored Sep 05, 2016
  
  508bda37
- Update locale dir name to zh · a0ef3cfc
  ibuler authored Sep 05, 2016
  
  a0ef3cfc
04 Sep, 2016 3 commits
- Merge branch 'cmdb' · 1b9c9c48
  ibuler authored Sep 04, 2016
  
  1b9c9c48
- Merge branch 'master' of code.simcu.com:jumpserver/jumpserver · 22e20d29
  ibuler authored Sep 04, 2016
  
  22e20d29
- Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb · 0604f76f
  ibuler authored Sep 04, 2016
  
  0604f76f