78 Commits

Author	SHA1	Message	Date
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	374dfbdac2	Force merge	2016-10-28 11:36:37 +08:00
ibuler	534321d1aa	Merge with master	2016-10-28 11:34:07 +08:00
ibuler	688bfa556c	Merge with audits	2016-10-27 23:04:02 +08:00
ibuler	589d0d0fac	Finish command log list	2016-10-27 22:58:19 +08:00
ibuler	c2aab50c7b	Add proxy log list	2016-10-25 23:23:01 +08:00
ibuler	45dcb26123	Merge branch 'audits'	2016-10-19 15:14:07 +08:00
ibuler	303659cb0e	Change app name apps => terrminal	2016-10-17 15:24:41 +08:00
ibuler	4531157c72	may be some wrong	2016-10-16 22:12:13 +08:00
江世峰	abe09e2a85	asset:update assets_list by tag	2016-10-14 19:28:58 +08:00
江世峰	73f5891f87	asset:update assets_list by tag	2016-10-12 18:57:51 +08:00
江世峰	b99b88a30f	asset:update tag	2016-10-08 18:33:00 +08:00
xiaokong1937@gmail.com	05e961f29f	user-group detail: fix #15	2016-09-30 20:50:40 +08:00
江世峰	474f7e0f68	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver ... merge	2016-09-30 18:26:02 +08:00
江世峰	fd52a85dbb	fix #25	2016-09-30 18:25:50 +08:00
xiaokong1937@gmail.com	f9b49605e4	user-group detail page: users op	2016-09-28 21:11:43 +08:00
xiaokong1937@gmail.com	70a6ddc897	fix #27	2016-09-27 20:16:46 +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	af713672fb	user list page bulk action	2016-09-22 16:06:46 +08:00
ibuler	ce5950ca73	Merge with asset	2016-09-20 00:43:30 +08:00
江世峰	6c7e51041f	update assets_group	2016-09-19 18:01:13 +08:00
江世峰	98757aa428	update assets_group	2016-09-19 17:25:41 +08:00
xiaoyu	8a5a4f3362	fix #14	2016-09-18 14:28:34 +08:00
ibuler	502c7e756b	Modify asset	2016-09-17 23:43:41 +08:00
ibuler	766bd3b76d	Move js to jumpserver.js	2016-09-15 13:09:24 +08:00
ibuler	bb8852d57e	Modify some style	2016-09-15 12:20:53 +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	1005fbabbd	add assets manage ... Sweet Alert	2016-09-14 15:38:54 +08:00
unknown	8490583d73	add assets manage ... Sweet Alert	2016-09-14 15:19:27 +08:00
xiaokong1937@gmail.com	6751c5a63a	reset user password and ssh pk implement	2016-09-13 21:45:10 +08:00
ibuler	6d736d7309	Finish permission create and list	2016-09-11 22:45:24 +08:00
ibuler	324bb68667	user-pserm	2016-09-11 16:59:19 +08:00
ibuler	4fc9274e00	Add asset system user	2016-09-09 00:09:49 +08:00
ibuler	6f4a832389	Add admin user list view	2016-09-08 00:40:59 +08:00
ibuler	4db352f55b	Add idc	2016-09-07 20:51:33 +08:00
ibuler	d8e6433404	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-07 20:06:01 +08:00
xiaokong1937@gmail.com	7f09b486d9	user-group edit serializer and url implement	2016-09-06 21:44:23 +08:00
ibuler	30fd51c268	Asset group detail	2016-09-06 21:39:21 +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	07dd6d1192	Reslove conflict	2016-09-06 15:56:03 +08:00
ibuler	25d9dbe93c	Merge with cmdb	2016-09-06 15:09:00 +08:00
xiaoyu	8cc09f0e5a	move login and logout view back to CBV	2016-09-06 15:03:37 +08:00
ibuler	02b5483d81	Update add->create edit->update and assetgrou->asset-grou etc format	2016-09-06 14:38:19 +08:00
ibuler	3c6f50b788	Modify some bug	2016-09-05 23:42:10 +08:00
ibuler	2cb6b15bc3	set textarea rows	2016-09-05 23:12:01 +08:00
xiaokong1937@gmail.com	397da7d676	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-05 21:38:37 +08:00