Commit Graph

349 Commits (bb9a067293703525d34369e295e17de97e37fcf7)
 

Author SHA1 Message Date
ibuler d323c9df88 Modify asset create
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 acfe8950b8 MOdify asset create
8 years ago
ibuler 502c7e756b Modify asset
8 years ago
ibuler 7fd224e690 Merge with user-perm
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
wangyong 343f139904 alter asset add and detail
8 years ago
wangyong b95c1deee1 alter asset add and detail
8 years ago
ibuler b5abb17568 Jiu zhe yang ba
8 years ago
ibuler ab2eeb0da3 Finish user asset form
8 years ago
ibuler e232962649 Update some template
8 years ago
wangyong 42012d7bfe merge master
8 years ago
ibuler 06b2c623cb Modify some bug
8 years ago
wangyong 792908eb35 asset add
8 years ago
ibuler a091036744 Add user permission select
8 years ago
ibuler d9812e2bdb Remove action from asset permission
8 years ago
ibuler 74b8ee8c10 Pre delete action
8 years ago
xiaokong1937@gmail.com db5d04c37f fix #13
8 years ago
xiaokong1937@gmail.com 7984806b38 change user ssh reset type from private key to public key
8 years ago
ibuler 766bd3b76d Move js to jumpserver.js
8 years ago
ibuler b2444c2aca Add fake data to init.json
8 years ago
ibuler bb8852d57e Modify some style
8 years ago
ibuler 037d9323a4 Modify and code review
8 years ago
ibuler f253d2ea69 Merge with master
8 years ago
ibuler a4dc27f073 Finish permissin detail asset list and user list
8 years ago
ibuler 812df7b07b Restore settings.py
8 years ago
unknown c237f82e51 restore settings
8 years ago
unknown e7c20f0707 add assets manage Sweet Alert"
8 years ago
unknown 0f9bdab108 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 1005fbabbd add assets manage
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
ibuler 4c4f598552 Finish asset permission detail and add user or user group list
8 years ago
unknown 7cff5cbf61 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
unknown 12831a7d21 text
8 years ago
ibuler 7b99a33a2f permission update and delete finished
8 years ago
ibuler 6d736d7309 Finish permission create and list
8 years ago
ibuler f558ded5bb Plan delete some view
8 years ago
ibuler 324bb68667 user-pserm
8 years ago
ibuler 70cae93a4b Add user perm model and form
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
ibuler 6069b8946b Start asset extend
8 years ago