Commits · 07dd6d1192842084a39891df5898f5bdc9312cac · ops / jumpserver

06 Sep, 2016 6 commits
- 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 23 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
- Add asset group view · 4855e86a
  ibuler authored Sep 04, 2016
  
  4855e86a
- cmdb merge model and url · 69349368
  wangyong authored Sep 04, 2016
  
  69349368
- asset add html · b531d9ee
  wangyong authored Sep 04, 2016
  
  b531d9ee
- Modify run_server.py · 246fcb8e
  ibuler authored Sep 04, 2016
  
  246fcb8e
- Add asset traslation · 3972bd3f
  ibuler authored Sep 04, 2016
  
  3972bd3f
- Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb · d1c96cd4
  ibuler authored Sep 04, 2016
  
  d1c96cd4
- Modify some and pull from server · 154783a9
  ibuler authored Sep 04, 2016
  
  154783a9
- fix null · fa07f4ee
  wangyong authored Sep 04, 2016
  
  fa07f4ee
- add admin|sys user model · 0e8e88fa
  wangyong authored Sep 04, 2016
  
  0e8e88fa
- add asset amdin|sys user model · 426c3c40
  wangyong authored Sep 04, 2016
  
  426c3c40
- Add translation · 8d0334e0
  ibuler authored Sep 04, 2016
  
  8d0334e0
- Asset add traslation · 0ab015ab
  ibuler authored Sep 04, 2016
  
  0ab015ab
- Merge branch 'master' into cmdb · 7350e150
  ibuler authored Sep 04, 2016
  
  7350e150
- Modify users url to singular · 61f02055
  ibuler authored Sep 04, 2016
  
  61f02055
- Add asset group view and url · 11d06b5e
  ibuler authored Sep 04, 2016
  
  11d06b5e
- Modify api style guide info · a9b5762f
  ibuler authored Sep 04, 2016
  
  a9b5762f
- Add new directory logs · 724b1c6f
  广宏伟 authored Sep 04, 2016
  
  724b1c6f
- Fix translation · acd98365
  ibuler authored Sep 04, 2016
  
  acd98365
- update · 32c49c08
  liuzheng712 authored Sep 03, 2016
  
  32c49c08
- mkdirp · d371c0c5
  liuzheng712 authored Sep 03, 2016
  
  d371c0c5