Commit Graph

202 Commits (70cae93a4b0308b0cfed4b94f864888c9ce7611b)
 

Author SHA1 Message Date
ibuler 0604f76f56 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
8 years ago
ibuler 4855e86a3f Add asset group view
8 years ago
wangyong 69349368bf cmdb merge model and url
8 years ago
wangyong b531d9eeb2 asset add html
8 years ago
ibuler 246fcb8efa Modify run_server.py
8 years ago
ibuler 3972bd3ff3 Add asset traslation
8 years ago
ibuler d1c96cd4b2 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
8 years ago
ibuler 154783a974 Modify some and pull from server
8 years ago
wangyong fa07f4ee8a fix null
8 years ago
wangyong 0e8e88fac0 add admin|sys user model
8 years ago
wangyong 426c3c4062 add asset amdin|sys user model
8 years ago
ibuler 8d0334e003 Add translation
8 years ago
ibuler 0ab015abfd Asset add traslation
8 years ago
ibuler 7350e150c8 Merge branch 'master' into cmdb
8 years ago
ibuler 61f0205529 Modify users url to singular
8 years ago
ibuler 11d06b5e2b Add asset group view and url
8 years ago
ibuler a9b5762fbc Modify api style guide info
8 years ago
广宏伟 724b1c6fd4 Add new directory logs
8 years ago
ibuler acd98365c1 Fix translation
8 years ago
liuzheng712 32c49c080c update
8 years ago
liuzheng712 d371c0c5ae mkdirp
8 years ago
ibuler 47171174b5 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
ibuler f274684473 Add translation for support i18n
8 years ago
wangyong d96ac56460 merge master
8 years ago
wangyong 77f3a1f146 add asset add
8 years ago
ibuler ba3f46fbd6 i18n
8 years ago
ibuler 0b406b6988 Add captch login using
8 years ago
ibuler 6f0cfd23c1 Rm logout.html
8 years ago
ibuler 10d51ada37 Update login error message
8 years ago
lijiejie 9fa70f6cb8 create a restframework api for cmdb models
8 years ago
lijiejie cec5a7f2c6 create the restframework url
8 years ago
lijiejie 829df26b0f create the api
8 years ago
ibuler b8bebc9b64 Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api
8 years ago
ibuler 90ca5a8bb7 start capcha support
8 years ago
ibuler 2c11255828 Add capacha support
8 years ago
ibuler 9803dd9547 Add ico, Modify forget_password
8 years ago
ibuler dcff84958f Add run development server script: run_server.py
8 years ago
ibuler 3a9cf6c360 Add forget password and reset password
8 years ago
ibuler 8ff872f41d Add ls config
8 years ago
ibuler 5940cec0e6 Add user and send mail
8 years ago
ibuler 5359da3ce2 Finish user login
8 years ago
ibuler c9369db578 Add new login page
8 years ago
ibuler d70deaf1ac Modify config-example
8 years ago
ibuler b31f8d5867 Add user generate reset password token
8 years ago
ibuler 5350f83275 Add celery usage more
8 years ago
广宏伟 dd80b94b43 Update README.md
8 years ago
广宏伟 4cbadbd941 Update README.rst
8 years ago
广宏伟 e61341df79 Update README.md to README.rst
8 years ago
ibuler f7ab26a5da Add celery broker
8 years ago
ibuler 0d3bde1191 User add confirmed
8 years ago