12 Commits

Author	SHA1	Message	Date
ibuler	0604f76f56	Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb	2016-09-04 21:47:20 +08:00
ibuler	4855e86a3f	Add asset group view	2016-09-04 21:47:10 +08:00
wangyong	69349368bf	cmdb merge model and url	2016-09-04 19:15:31 +08:00
wangyong	b531d9eeb2	asset add html	2016-09-04 19:12:31 +08:00
ibuler	3972bd3ff3	Add asset traslation	2016-09-04 19:05:47 +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	77f3a1f146	add asset add	2016-09-03 19:05:50 +08:00
wangyong	d0d433db1a	add asset_list	2016-08-30 13:50:30 +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