Commit Graph

67 Commits (220892824c55f15832a8139de8d83fc74763bf97)

Author SHA1 Message Date
ibuler 220892824c Finish some bug
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
ibuler 24e31a69cb finish asset
8 years ago
江世峰 98757aa428 update assets_group
8 years ago
ibuler d323c9df88 Modify asset create
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
wangyong 343f139904 alter asset add and detail
8 years ago
wangyong b95c1deee1 alter asset add and detail
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
wangyong 792908eb35 asset add
8 years ago
ibuler a091036744 Add user permission select
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
unknown 1005fbabbd add assets manage
8 years ago
unknown 8490583d73 add assets manage
8 years ago
ibuler 5bca783e12 permission user search
8 years ago
ibuler 6d736d7309 Finish permission create and list
8 years ago
ibuler 70cae93a4b Add user perm model and form
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
ibuler 239dd0567f Finish admin user view
8 years ago
ibuler ff30435eb4 Finish adin user add
8 years ago
ibuler 5a0b119410 Stash it
8 years ago
ibuler 6f4a832389 Add admin user list view
8 years ago
ibuler dfc628a397 modify idc
8 years ago
ibuler 4db352f55b Add idc
8 years ago
ibuler d0ba17374e Finish asset group create
8 years ago
ibuler 30fd51c268 Asset group detail
8 years ago
wangyong bc232c4f77 merge cmdb
8 years ago
wangyong 342e4bdee8 change some html
8 years ago
ibuler 170b49428c change date_added -> date_created
8 years ago
ibuler 25d9dbe93c Merge with cmdb
8 years ago
ibuler 02b5483d81 Update add->create edit->update and assetgrou->asset-grou etc format
8 years ago
ibuler b8c10a0350 Add assetgroup form save action
8 years ago
ibuler 126d7fd62c Add asset group add Form m2m
8 years ago
ibuler 2f5b7ad654 Modify asset model
8 years ago
ibuler 8827fd2d74 Modify translation
8 years ago
ibuler 0604f76f56 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
8 years ago
ibuler 4855e86a3f Add asset group view
8 years ago
wangyong 69349368bf cmdb merge model and url
8 years ago
wangyong b531d9eeb2 asset add html
8 years ago