Commit Graph

77 Commits (afb923737c8edfda4106111a397152d252934023)

Author SHA1 Message Date
ibuler 41337d28c3 add proxy log search
8 years ago
ibuler 374dfbdac2 Force merge
8 years ago
ibuler 534321d1aa Merge with master
8 years ago
ibuler 688bfa556c Merge with audits
8 years ago
ibuler 589d0d0fac Finish command log list
8 years ago
ibuler c2aab50c7b Add proxy log list
8 years ago
ibuler 45dcb26123 Merge branch 'audits'
8 years ago
ibuler 303659cb0e Change app name apps => terrminal
8 years ago
ibuler 4531157c72 may be some wrong
8 years ago
江世峰 abe09e2a85 asset:update assets_list by tag
8 years ago
江世峰 73f5891f87 asset:update assets_list by tag
8 years ago
江世峰 b99b88a30f asset:update tag
8 years ago
xiaokong1937@gmail.com 05e961f29f user-group detail: fix #15
8 years ago
江世峰 474f7e0f68 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
8 years ago
江世峰 fd52a85dbb fix #25
8 years ago
xiaokong1937@gmail.com f9b49605e4 user-group detail page: users op
8 years ago
xiaokong1937@gmail.com 70a6ddc897 fix #27
8 years ago
xiaoyu 15dcc760b4 user list bulk update modal
8 years ago
xiaoyu d2197d99c2 fix #26
8 years ago
xiaoyu af713672fb user list page bulk action
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
江世峰 6c7e51041f update assets_group
8 years ago
江世峰 98757aa428 update assets_group
8 years ago
xiaoyu 8a5a4f3362 fix #14
8 years ago
ibuler 502c7e756b Modify asset
8 years ago
ibuler 766bd3b76d Move js to jumpserver.js
8 years ago
ibuler bb8852d57e Modify some style
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 1005fbabbd add assets manage
8 years ago
unknown 8490583d73 add assets manage
8 years ago
xiaokong1937@gmail.com 6751c5a63a reset user password and ssh pk implement
8 years ago
ibuler 6d736d7309 Finish permission create and list
8 years ago
ibuler 324bb68667 user-pserm
8 years ago
ibuler 4fc9274e00 Add asset system user
8 years ago
ibuler 6f4a832389 Add admin user list view
8 years ago
ibuler 4db352f55b Add idc
8 years ago
ibuler d8e6433404 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
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
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 2cb6b15bc3 set textarea rows
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