95 Commits

Author	SHA1	Message	Date
ibuler	034f0a02b1	Update terminal api	2017-10-31 11:34:20 +08:00
GuangHongwei	458989328e	[Bugfix] 修改bug，使用py3编程	2017-05-15 23:39:54 +08:00
ibuler	0983f294b7	[Fixture] 添加用户profile	2017-03-30 00:51:36 +08:00
xiaokong1937@gmail.com	f3647ea46d	user-profile page	2017-01-25 21:19:16 +08:00
ibuler	072da114db	Finish system user list	2016-11-06 22:45:26 +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
江世峰	73f0199dc0	asset:add assets_bulk	2016-10-21 21:14:49 +08:00
江世峰	4e1f9c97a5	asset:update assets_list by tag	2016-10-16 22:35:25 +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	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	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
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	ab2eeb0da3	Finish user asset form	2016-09-17 01:04:52 +08:00
ibuler	e232962649	Update some template	2016-09-16 20:53:10 +08:00
unknown	e7c20f0707	add assets manage Sweet Alert"	2016-09-14 15:51:09 +08:00
unknown	8490583d73	add assets manage ... Sweet Alert	2016-09-14 15:19:27 +08:00
ibuler	d8e6433404	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-07 20:06:01 +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
ibuler	9803dd9547	Add ico, Modify forget_password	2016-09-02 18:10:26 +08:00
ibuler	3a9cf6c360	Add forget password and reset password	2016-09-01 23:09:58 +08:00
ibuler	8ff872f41d	Add ls config	2016-09-01 16:05:14 +08:00
ibuler	c9369db578	Add new login page	2016-08-31 20:39:25 +08:00
ibuler	3c3fda8064	Change chosen To select2 lib	2016-08-23 14:44:06 +08:00
ibuler	cf15b7eaff	Add UserGroup some View	2016-08-19 01:39:08 +08:00
ibuler	651e89994e	modify list and sort	2016-08-18 22:29:35 +08:00
ibuler	279987925a	Modify user detail of usergroup	2016-08-18 00:47:34 +08:00
ibuler	824b1c7f6f	update user update view	2016-08-17 22:17:16 +08:00
ibuler	35abf16f7d	Modify panel color	2016-08-17 00:22:33 +08:00
ibuler	7a8d4a3a59	Add delete view	2016-08-16 22:13:06 +08:00
ibuler	234684c875	Rename dir name dashboard to apps ... It's may be well	2016-08-13 21:59:08 +08:00