jumpserver

Author	SHA1	Message	Date
xiaoyu	61d1d9ec90	temp	2016-09-21 15:48:21 +08:00
xiaoyu	f00da20764	user-group delete implement	2016-09-19 15:47:58 +08:00
xiaoyu	8a5a4f3362	fix #14	2016-09-18 14:28:34 +08:00
xiaokong1937@gmail.com	6751c5a63a	reset user password and ssh pk implement	2016-09-13 21:45:10 +08:00
xiaokong1937@gmail.com	7f09b486d9	user-group edit serializer and url implement	2016-09-06 21:44:23 +08:00
xiaokong1937@gmail.com	556fb4e09f	refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes	2016-09-06 21:03:51 +08:00
xiaoyu	c6f875c517	temp commit	2016-09-06 16:40:44 +08:00
ibuler	02b5483d81	Update add->create edit->update and assetgrou->asset-grou etc format	2016-09-06 14:38:19 +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
ibuler	011c125564	Modify user active api And Add Token authorization	2016-08-30 00:10:27 +08:00
ibuler	0a9e4a5e85	Modify urls.conf: Merge to single	2016-08-25 13:28:02 +08:00
ibuler	8aa92bb688	Add api: UserApi And UserGroupApi	2016-08-24 19:42:16 +08:00
ibuler	1d5faa3101	Delete Model: Role	2016-08-24 17:14:21 +08:00
ibuler	b97b34961c	Modify api: complete some setting	2016-08-24 12:29:19 +08:00
ibuler	a43ac90b21	Modify CRLF to LF	2016-08-24 00:13:58 +08:00
ibuler	6458231946	Add api file	2016-08-24 00:11:13 +08:00