Commits · 0604f76f56c27ab1ac6306f121adcb083c32cf66 · ops / jumpserver

04 Sep, 2016 19 commits
- 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
- Fix translation · acd98365
  ibuler authored Sep 04, 2016
  
  acd98365
- Add translation for support i18n · f2746844
  ibuler authored Sep 03, 2016
  
  f2746844
03 Sep, 2016 6 commits
- merge master · d96ac564
  wangyong authored Sep 03, 2016
  
  d96ac564
- add asset add · 77f3a1f1
  wangyong authored Sep 03, 2016
  
  77f3a1f1
- i18n · ba3f46fb
  ibuler authored Sep 03, 2016
  
  ba3f46fb
- Add captch login using · 0b406b69
  ibuler authored Sep 03, 2016
  
  0b406b69
- Rm logout.html · 6f0cfd23
  ibuler authored Sep 02, 2016
  
  6f0cfd23
- Update login error message · 10d51ada
  ibuler authored Sep 02, 2016
  
  10d51ada
02 Sep, 2016 7 commits
- create a restframework api for cmdb models · 9fa70f6c
  lijiejie authored Sep 02, 2016
  
  9fa70f6c
- create the restframework url · cec5a7f2
  lijiejie authored Sep 02, 2016
  
  cec5a7f2
- create the api · 829df26b
  lijiejie authored Sep 02, 2016
  
  829df26b
- Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api · b8bebc9b
  ibuler authored Sep 02, 2016
  
  b8bebc9b
- start capcha support · 90ca5a8b
  ibuler authored Sep 02, 2016
  
  90ca5a8b
- Add capacha support · 2c112558
  ibuler authored Sep 02, 2016
  
  2c112558
- Add ico, Modify forget_password · 9803dd95
  ibuler authored Sep 02, 2016
  
  9803dd95
01 Sep, 2016 4 commits
- Add run development server script: run_server.py · dcff8495
  ibuler authored Sep 01, 2016
  
  dcff8495
- Add forget password and reset password · 3a9cf6c3
  ibuler authored Sep 01, 2016
  
  3a9cf6c3
- Add ls config · 8ff872f4
  ibuler authored Sep 01, 2016
  
  8ff872f4
- Add user and send mail · 5940cec0
  ibuler authored Aug 31, 2016
  
  5940cec0
31 Aug, 2016 4 commits
- Finish user login · 5359da3c
  ibuler authored Aug 31, 2016
  
  5359da3c
- Add new login page · c9369db5
  ibuler authored Aug 31, 2016
  
  c9369db5
- Modify config-example · d70deaf1
  ibuler authored Aug 31, 2016
  
  d70deaf1
- Add user generate reset password token · b31f8d58
  ibuler authored Aug 31, 2016
  
  b31f8d58