1017 Commits (957d3660ce13e650d0e2cd08113f705aafc8da19)

Author	SHA1	Message	Date
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	0ab015abfd	Asset add traslation	2016-09-04 17:15:26 +08:00
ibuler	11d06b5e2b	Add asset group view and url	2016-09-04 16:02:51 +08:00
wangyong	d96ac56460	merge master	2016-09-03 23:01:36 +08:00
wangyong	77f3a1f146	add asset add	2016-09-03 19:05:50 +08:00
lijiejie	cec5a7f2c6	create the restframework url	2016-09-02 22:51:10 +08:00
lijiejie	829df26b0f	create the api	2016-09-02 22:49:51 +08:00
ibuler	ffed46175d	update .gitignore	2016-08-30 17:26:33 +08:00
wangyong	d0d433db1a	add asset_list	2016-08-30 13:50:30 +08:00
wangyong	3771b2ff70	add asset detail and list	2016-08-21 22:12:17 +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