Commit Graph

212 Commits (72ad4b44ce6bfdaf657e5bda2a2dfe4227bf0d62)

Author SHA1 Message Date
xiaokong1937@gmail.com 05e961f29f user-group detail: fix #15
8 years ago
xiaokong1937@gmail.com d8143a67cd user-group-detail: user-adding frontend integration
8 years ago
ibuler acf51238d0 Modify ssh server bug for using public key
8 years ago
xiaoyu e7fddf80ae user-group-detail: add users support
8 years ago
xiaokong1937@gmail.com f9b49605e4 user-group detail page: users op
8 years ago
xiaokong1937@gmail.com 2522f0d80f trivial changes: refactor the jumpserver DataTable api
8 years ago
xiaokong1937@gmail.com 70a6ddc897 fix #27
8 years ago
xiaokong1937@gmail.com 49f007601f add user-list-delete support for user-group detail page
8 years ago
xiaokong1937@gmail.com 74cdd2d0f3 user list groups bulk update
8 years ago
xiaoyu 15dcc760b4 user list bulk update modal
8 years ago
xiaoyu d2197d99c2 fix #26
8 years ago
ibuler cfef374454 Update ssh server
8 years ago
ibuler 7ab47916f2 add __init__.py
8 years ago
ibuler 283c53fddf Update gitignore
8 years ago
ibuler da56310db9 update .gitignore
8 years ago
ibuler 4925f3227a update .gitignore
8 years ago
ibuler 88bb620af2 Modify ignore
8 years ago
xiaoyu 22163173fe user bulk delete view
8 years ago
xiaoyu af713672fb user list page bulk action
8 years ago
xiaoyu 515406c05d temp: deactive test
8 years ago
xiaoyu 61d1d9ec90 temp
8 years ago
ibuler 220892824c Finish some bug
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
xiaokong1937@gmail.com 65461a09a7 user-group edit implement
8 years ago
xiaoyu 9a81057d95 fix a typo
8 years ago
xiaoyu f00da20764 user-group delete implement
8 years ago
xiaokong1937@gmail.com 4e2a41f4cf user-group draft
8 years ago
xiaoyu 8a5a4f3362 fix #14
8 years ago
xiaoyu 8cdc4674d7 update toastr js and close #8
8 years ago
ibuler 502c7e756b Modify asset
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
ibuler 06b2c623cb Modify some bug
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 0f9bdab108 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 8490583d73 add assets manage
8 years ago
ibuler 5bca783e12 permission user search
8 years ago
xiaokong1937@gmail.com 6751c5a63a reset user password and ssh pk implement
8 years ago
xiaoyu 00502ce33d trivial js style changes; bugfix for patch method
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
ibuler 324bb68667 user-pserm
8 years ago
ibuler 627a5825f4 Add user perm
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
ibuler 239dd0567f Finish admin user view
8 years ago
xiaokong1937@gmail.com 62cac20ba7 fix #9
8 years ago
ibuler ff30435eb4 Finish adin user add
8 years ago
ibuler ccfe9b9d08 Merge branch 'admin-user'
8 years ago
ibuler 6f4a832389 Add admin user list view
8 years ago
xiaokong1937@gmail.com 8acbcb2ed2 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
xiaokong1937@gmail.com 04151b9957 user group quickedit frontend and rest API
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
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 3c6f50b788 Modify some bug
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 508bda37f5 Modify form datetime valid error, because form format
8 years ago
ibuler a0ef3cfc34 Update locale dir name to zh
8 years ago
ibuler 4855e86a3f Add asset group view
8 years ago
ibuler 3972bd3ff3 Add asset traslation
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 acd98365c1 Fix translation
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
ibuler 90ca5a8bb7 start capcha support
8 years ago