Commit Graph

284 Commits (e7fddf80ae62d445d01e8ea830fd0e308e52bca5)
 

Author SHA1 Message Date
ibuler dfc628a397 modify idc
8 years ago
ibuler 4db352f55b Add idc
8 years ago
ibuler d8e6433404 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
ibuler d0ba17374e Finish asset group create
8 years ago
xiaokong1937@gmail.com 7f09b486d9 user-group edit serializer and url implement
8 years ago
ibuler 30fd51c268 Asset group detail
8 years ago
xiaokong1937@gmail.com 556fb4e09f refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes
8 years ago
xiaokong1937@gmail.com a3096689b5 Merge branch 'xiaoyu'
8 years ago
wangyong bc232c4f77 merge cmdb
8 years ago
wangyong 342e4bdee8 change some html
8 years ago
ibuler dc01833a5b Forget to forgot
8 years ago
ibuler 170b49428c change date_added -> date_created
8 years ago
xiaoyu c6f875c517 temp commit
8 years ago
ibuler 07dd6d1192 Reslove conflict
8 years ago
ibuler 25d9dbe93c Merge with cmdb
8 years ago
xiaoyu 8cc09f0e5a move login and logout view back to CBV
8 years ago
ibuler 02b5483d81 Update add->create edit->update and assetgrou->asset-grou etc format
8 years ago
ibuler b8c10a0350 Add assetgroup form save action
8 years ago
ibuler 126d7fd62c Add asset group add Form m2m
8 years ago
ibuler 3c6f50b788 Modify some bug
8 years ago
ibuler 2cb6b15bc3 set textarea rows
8 years ago
ibuler 2f5b7ad654 Modify asset model
8 years ago
xiaokong1937@gmail.com 6aedfb5219 fix small template erros
8 years ago
xiaokong1937@gmail.com 397da7d676 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
xiaokong1937@gmail.com e75d33439a fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness
8 years ago
ibuler 7241f7509f Update nav
8 years ago
ibuler 8827fd2d74 Modify translation
8 years ago
ibuler 6fc3bbb97d Update initial data: fixtures dir
8 years ago
ibuler 508bda37f5 Modify form datetime valid error, because form format
8 years ago
ibuler a0ef3cfc34 Update locale dir name to zh
8 years ago
ibuler 1b9c9c48b6 Merge branch 'cmdb'
8 years ago
ibuler 22e20d29f5 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
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