jumpserver

Author	SHA1	Message	Date
ibuler	25cb47d2f5	[Change] 拆分user view为多个view	2017-01-17 16:34:47 +08:00
ibuler	17657deb0e	[Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude	2017-01-08 13:35:59 +08:00
ibuler	49861b6a84	Merge with master	2017-01-07 22:34:12 +08:00
右书僮	dbdb8a58fe	资产相关API及Web	2017-01-06 20:34:24 +08:00
ibuler	70da177ed7	Update api	2016-12-29 19:17:00 +08:00
wangjun5	87eed2e59b	add asset tool	2016-12-15 19:55:15 +08:00
ibuler	3aea994101	asset import	2016-11-27 14:37:50 +08:00
ibuler	c1c9c7b68a	update asset	2016-11-25 22:45:47 +08:00
ibuler	6e843533cb	Base finish user	2016-11-25 11:00:51 +08:00
ibuler	205c11dfba	Finish list paganation	2016-11-18 12:00:23 +08:00
ibuler	e89d3b3807	Update asset	2016-11-17 19:28:45 +08:00
ibuler	db8b0022fc	Update usergroup detail	2016-11-15 19:33:04 +08:00
ibuler	f70abec5ef	Finish user detail	2016-11-10 22:06:23 +08:00
ibuler	dde9ffb2ae	Update perm api	2016-11-10 00:18:57 +08:00
ibuler	072da114db	Finish system user list	2016-11-06 22:45:26 +08:00
ibuler	968b1b4cb6	Stash	2016-11-06 21:29:04 +08:00
ibuler	afb923737c	Merge with audits	2016-11-06 11:52:25 +08:00
ibuler	1159d9494c	Update signer	2016-11-01 17:21:16 +08:00
江世峰	3d4f79ca59	asset:add assets_bulk_update	2016-10-28 21:19:37 +08:00
江世峰	cdb1602e06	asset:add assets_bulk	2016-10-22 20:21:36 +08:00