Commit Graph

70 Commits (67ecc108bd9b6a86f5ae5af9d9424e929d2db064)

Author SHA1 Message Date
xiaokong1937@gmail.com 6856fad0c0 integrate the user-group list page with its api;
8 years ago
xiaokong1937@gmail.com d40aa49d8c user bulk import through Excel and close #20
8 years ago
xiaoyu 15dcc760b4 user list bulk update modal
8 years ago
xiaokong1937@gmail.com 65461a09a7 user-group edit implement
8 years ago
xiaokong1937@gmail.com 4e2a41f4cf user-group draft
8 years ago
xiaoyu 8a5a4f3362 fix #14
8 years ago
ibuler dc4d388d9a Merge with master
8 years ago
ibuler df281defd8 Finish user detail asset grant ..
8 years ago
ibuler 7d3474aeea Add user permission user list
8 years ago
ibuler b5abb17568 Jiu zhe yang ba
8 years ago
ibuler ab2eeb0da3 Finish user asset form
8 years ago
xiaokong1937@gmail.com 7984806b38 change user ssh reset type from private key to public key
8 years ago
ibuler 037d9323a4 Modify and code review
8 years ago
ibuler f253d2ea69 Merge with master
8 years ago
unknown 8490583d73 add assets manage
8 years ago
unknown 7cff5cbf61 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 12831a7d21 text
8 years ago
ibuler 6d736d7309 Finish permission create and list
8 years ago
xiaokong1937@gmail.com 899233338d #8 user first login view
8 years ago
xiaokong1937@gmail.com a7e3f9c465 #8 user first login view
8 years ago
xiaokong1937@gmail.com d8fe59debb temp save for issue 8
8 years ago
ibuler 409fac3ef1 Merge branch 'admin-user'
8 years ago
xiaokong1937@gmail.com 62cac20ba7 fix #9
8 years ago
ibuler ff30435eb4 Finish adin user add
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
ibuler 170b49428c change date_added -> date_created
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 3c6f50b788 Modify some bug
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 508bda37f5 Modify form datetime valid error, because form format
8 years ago
ibuler a0ef3cfc34 Update locale dir name to zh
8 years ago
ibuler 3972bd3ff3 Add asset traslation
8 years ago
ibuler f274684473 Add translation for support i18n
8 years ago
ibuler ba3f46fbd6 i18n
8 years ago
ibuler 0b406b6988 Add captch login using
8 years ago
ibuler 10d51ada37 Update login error message
8 years ago
ibuler 90ca5a8bb7 start capcha support
8 years ago
ibuler 9803dd9547 Add ico, Modify forget_password
8 years ago
ibuler 3a9cf6c360 Add forget password and reset password
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 0d3bde1191 User add confirmed
8 years ago
ibuler 3eb4897bd3 Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api
8 years ago
ibuler 3c9dbaf860 Fix some bug
8 years ago
ibuler d918d5b466 Add Logger setting .
8 years ago
ibuler d95ffdfbf7 Test permmision
8 years ago