Commit Graph

141 Commits (220892824c55f15832a8139de8d83fc74763bf97)

Author SHA1 Message Date
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