366 Commits

Author	SHA1	Message	Date
ibuler	bd882c8bef	User group detail	2016-11-15 00:48:48 +08:00
ibuler	8d358a7a68	UPdate some	2016-11-14 19:28:21 +08:00
ibuler	10aa8c40a7	Add login log	2016-11-10 23:54:21 +08:00
ibuler	f70abec5ef	Finish user detail	2016-11-10 22:06:23 +08:00
ibuler	69f2bf664b	Finish user permission revoke	2016-11-10 16:59:50 +08:00
ibuler	47090eb0f7	update some user api	2016-11-09 23:49:10 +08:00
ibuler	8d7759d22f	change user api	2016-11-09 19:29:15 +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	41337d28c3	add proxy log search	2016-11-05 01:15:25 +08:00
ibuler	f437d3f883	update	2016-11-03 19:42:47 +08:00
ibuler	f1dfba6a93	Update some asset issues	2016-10-31 19:31:56 +08:00
ibuler	6164896793	Update some thing	2016-10-19 18:33:14 +08:00
ibuler	4531157c72	may be some wrong	2016-10-16 22:12:13 +08:00
xiaokong1937@gmail.com	6856fad0c0	integrate the user-group list page with its api;	2016-10-02 11:09:27 +08:00
xiaokong1937@gmail.com	d40aa49d8c	user bulk import through Excel and close #20	2016-10-01 20:26:43 +08:00
xiaokong1937@gmail.com	05e961f29f	user-group detail: fix #15	2016-09-30 20:50:40 +08:00
xiaokong1937@gmail.com	d8143a67cd	user-group-detail: user-adding frontend integration	2016-09-29 21:14:55 +08:00
xiaoyu	e7fddf80ae	user-group-detail: add users support	2016-09-29 16:41:55 +08:00
xiaokong1937@gmail.com	f9b49605e4	user-group detail page: users op	2016-09-28 21:11:43 +08:00
xiaokong1937@gmail.com	2522f0d80f	trivial changes: refactor the jumpserver DataTable api	2016-09-27 21:28:02 +08:00
xiaokong1937@gmail.com	70a6ddc897	fix #27	2016-09-27 20:16:46 +08:00
xiaokong1937@gmail.com	49f007601f	add user-list-delete support for user-group detail page	2016-09-26 21:22:48 +08:00
xiaokong1937@gmail.com	74cdd2d0f3	user list groups bulk update	2016-09-26 19:39:43 +08:00
xiaoyu	15dcc760b4	user list bulk update modal	2016-09-26 16:33:10 +08:00
xiaoyu	d2197d99c2	fix #26	2016-09-26 11:30:43 +08:00
xiaoyu	22163173fe	user bulk delete view	2016-09-23 16:30:59 +08:00
xiaoyu	af713672fb	user list page bulk action	2016-09-22 16:06:46 +08:00
xiaoyu	515406c05d	temp: deactive test	2016-09-21 16:43:41 +08:00
xiaoyu	61d1d9ec90	temp	2016-09-21 15:48:21 +08:00
ibuler	220892824c	Finish some bug	2016-09-20 01:13:50 +08:00
ibuler	ce5950ca73	Merge with asset	2016-09-20 00:43:30 +08:00
xiaokong1937@gmail.com	65461a09a7	user-group edit implement	2016-09-19 21:08:08 +08:00
xiaoyu	f00da20764	user-group delete implement	2016-09-19 15:47:58 +08:00
xiaokong1937@gmail.com	4e2a41f4cf	user-group draft	2016-09-18 21:00:07 +08:00
xiaoyu	8a5a4f3362	fix #14	2016-09-18 14:28:34 +08:00
xiaoyu	8cdc4674d7	update toastr js and close #8	2016-09-18 10:32:23 +08:00
ibuler	502c7e756b	Modify asset	2016-09-17 23:43:41 +08:00
ibuler	dc4d388d9a	Merge with master	2016-09-17 18:53:11 +08:00
ibuler	df281defd8	Finish user detail asset grant ..	2016-09-17 18:51:19 +08:00
ibuler	7d3474aeea	Add user permission user list	2016-09-17 15:20:33 +08:00
ibuler	b5abb17568	Jiu zhe yang ba	2016-09-17 13:04:26 +08:00
ibuler	ab2eeb0da3	Finish user asset form	2016-09-17 01:04:52 +08:00
ibuler	06b2c623cb	Modify some bug	2016-09-16 17:23:47 +08:00
xiaokong1937@gmail.com	7984806b38	change user ssh reset type from private key to public key	2016-09-15 16:54:00 +08:00
ibuler	f253d2ea69	Merge with master	2016-09-14 23:31:22 +08:00
unknown	0f9bdab108	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-14 15:40:47 +08:00
unknown	8490583d73	add assets manage ... Sweet Alert	2016-09-14 15:19:27 +08:00
ibuler	5bca783e12	permission user search	2016-09-14 01:08:26 +08:00
xiaokong1937@gmail.com	6751c5a63a	reset user password and ssh pk implement	2016-09-13 21:45:10 +08:00