Commit Graph

31 Commits (f00da207649924820c61192e7a96d25610e71a10)

Author SHA1 Message Date
ibuler 7fd224e690 Merge with user-perm 2016-09-17 19:15:14 +08:00
wangyong 343f139904 alter asset add and detail 2016-09-17 14:52:14 +08:00
wangyong b95c1deee1 alter asset add and detail 2016-09-17 14:50:14 +08:00
ibuler ab2eeb0da3 Finish user asset form 2016-09-17 01:04:52 +08:00
ibuler e232962649 Update some template 2016-09-16 20:53:10 +08:00
wangyong 42012d7bfe merge master 2016-09-16 17:32:35 +08:00
wangyong 792908eb35 asset add 2016-09-16 17:23:23 +08:00
ibuler bb8852d57e Modify some style 2016-09-15 12:20:53 +08:00
unknown 8490583d73 add assets manage
Sweet Alert
2016-09-14 15:19:27 +08:00
ibuler c58725dbc0 Finish system user view 2016-09-09 23:19:39 +08:00
ibuler 292179d41d system-user 2016-09-09 21:48:44 +08:00
ibuler 4fc9274e00 Add asset system user 2016-09-09 00:09:49 +08:00
ibuler 5259dd8054 Asset form: Add some comment 2016-09-08 22:54:05 +08:00
ibuler 239dd0567f Finish admin user view 2016-09-08 20:39:06 +08:00
ibuler ff30435eb4 Finish adin user add 2016-09-08 18:12:53 +08:00
ibuler 6f4a832389 Add admin user list view 2016-09-08 00:40:59 +08:00
ibuler 4db352f55b Add idc 2016-09-07 20:51:33 +08:00
ibuler d0ba17374e Finish asset group create 2016-09-07 20:05:42 +08:00
ibuler 30fd51c268 Asset group detail 2016-09-06 21:39:21 +08:00
ibuler 02b5483d81 Update add->create edit->update and assetgrou->asset-grou etc format 2016-09-06 14:38:19 +08:00
ibuler 126d7fd62c Add asset group add Form m2m 2016-09-06 00:49:42 +08:00
ibuler 4855e86a3f Add asset group view 2016-09-04 21:47:10 +08:00
ibuler 3972bd3ff3 Add asset traslation 2016-09-04 19:05:47 +08:00
ibuler d1c96cd4b2 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb 2016-09-04 18:07:19 +08:00
ibuler 154783a974 Modify some and pull from server 2016-09-04 18:07:15 +08:00
wangyong fa07f4ee8a fix null 2016-09-04 18:06:14 +08:00
wangyong 0e8e88fac0 add admin|sys user model 2016-09-04 17:50:30 +08:00
wangyong 426c3c4062 add asset amdin|sys user model 2016-09-04 17:43:03 +08:00
ibuler 11d06b5e2b Add asset group view and url 2016-09-04 16:02:51 +08:00
wangyong fcd39370ed add asset some cbv 2016-08-14 22:10:10 +08:00
ibuler 234684c875 Rename dir name dashboard to apps
It's may be well
2016-08-13 21:59:08 +08:00