Commit Graph

281 Commits (67ecc108bd9b6a86f5ae5af9d9424e929d2db064)

Author SHA1 Message Date
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 ab18fe466b stash
8 years ago
ibuler 88bb620af2 Modify ignore
8 years ago
ibuler 1f3d763490 Add requirement
8 years ago
江世峰 184ac728db Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 5bf414ffb5 update add_assets-group
8 years ago
xiaoyu 22163173fe user bulk delete view
8 years ago
江世峰 18341717a1 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 d2e989403f update assets-group
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 c7f3aaa654 Change appname webterminal to terminal
8 years ago
ibuler 220892824c Finish some bug
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
ibuler 24e31a69cb finish asset
8 years ago
xiaokong1937@gmail.com 65461a09a7 user-group edit implement
8 years ago
江世峰 6c7e51041f update assets_group
8 years ago
江世峰 98757aa428 update assets_group
8 years ago
xiaoyu 9a81057d95 fix a typo
8 years ago
xiaoyu f00da20764 user-group delete implement
8 years ago
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
ibuler c58725dbc0 Finish system user view
8 years ago
ibuler 292179d41d system-user
8 years ago
ibuler a89ae94d85 Update system user create template script
8 years ago
ibuler 4fc9274e00 Add asset system user
8 years ago
ibuler 5259dd8054 Asset form: Add some comment
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 5a0b119410 Stash it
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 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