81 Commits

Author	SHA1	Message	Date
GuangHongwei	458989328e	[Bugfix] 修改bug，使用py3编程	2017-05-15 23:39:54 +08:00
ibuler	92ebe85a3f	[Fixture] 详情页添加system user 推送	2017-04-05 19:09:51 +08:00
ibuler	0983f294b7	[Fixture] 添加用户profile	2017-03-30 00:51:36 +08:00
ibuler	b055144908	Merge with audits	2017-03-01 15:35:11 +08:00
ibuler	a79c3dd156	[Fixture] 添加command log backends, 未来支持es	2017-02-06 23:13:27 +08:00
xiaokong1937@gmail.com	f3647ea46d	user-profile page	2017-01-25 21:19:16 +08:00
ibuler	0869931e67	[Bugfix] 修改了一些issue上的bug	2017-01-20 20:13:22 +08:00
ibuler	8658675f67	[Bugfix] 重命名applications导致api请求content_type不对	2017-01-09 23:12:32 +08:00
ibuler	775cd523eb	Update app terminal name to applications	2016-12-25 23:10:53 +08:00
yumaojun03	046c7e21e9	Merge remote-tracking branch 'origin/master' into ops_dev ... # Conflicts: # requirements.txt	2016-12-19 23:55:54 +08:00
yumaojun03	b348f7f1ce	添加了部分cron的list页面	2016-12-14 09:54:16 +08:00
ibuler	d8a229c09b	to Commpany	2016-11-25 08:39:24 +08:00
ibuler	205c11dfba	Finish list paganation	2016-11-18 12:00:23 +08:00
ibuler	a5e487441f	prepare change api name	2016-11-16 17:38:03 +08:00
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	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	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	688bfa556c	Merge with audits	2016-10-27 23:04:02 +08:00
ibuler	c0de35a683	Add layer and layer open command log	2016-10-27 00:52:44 +08:00
ibuler	5d3f9b4a03	Add command list	2016-10-26 19:10:14 +08:00
ibuler	c2aab50c7b	Add proxy log list	2016-10-25 23:23:01 +08:00
江世峰	f88c149076	asset:add assets_bulk	2016-10-25 02:16:20 +08:00
ibuler	6a510dad6c	Update some bug	2016-10-24 19:32:53 +08:00
江世峰	80baecc8be	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver ... Merge	2016-10-21 21:15:04 +08:00
江世峰	73f0199dc0	asset:add assets_bulk	2016-10-21 21:14:49 +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
江世峰	4e1f9c97a5	asset:update assets_list by tag	2016-10-16 22:35:25 +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
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	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
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
ibuler	4925f3227a	update .gitignore	2016-09-24 21:57:24 +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