1142 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	c78ab8edf7	fix 日志记录名称	2015-12-17 17:35:57 +08:00
ibuler	f8213a1a2a	user update password null	2015-12-17 11:05:43 +08:00
ibuler	da7cc102a3	fix null bug	2015-12-17 10:52:48 +08:00
ibuler	ea29305f8b	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-17 10:08:49 +08:00
ibuler	9fb71ade71	remove install wizzrd	2015-12-17 10:08:38 +08:00
ibuler	5740dec7b4	add install wizzrd	2015-12-17 10:04:19 +08:00
wangyong	7c742bf061	fix del idc failed	2015-12-16 22:24:29 +08:00
yumaojun	a30ec0c75e	修复 sudo 规则删除bug	2015-12-16 18:34:19 +08:00
yumaojun	b8abedc5b9	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-15 22:16:15 +08:00
ibuler	ef7f42cf6d	reset password fix	2015-12-15 19:36:33 +08:00
ibuler	e817715da3	fix asset update bug	2015-12-15 17:35:02 +08:00
ibuler	9c0825ce70	fix more role open exec window width bug	2015-12-15 16:46:14 +08:00
ibuler	2e81f0cf95	fix nav active bug	2015-12-15 14:48:37 +08:00
ibuler	c4b099d2a5	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-15 14:45:41 +08:00
ibuler	f3606dfd96	add install wizzird	2015-12-15 14:45:37 +08:00
yumaojun	05f80f743b	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-14 20:28:39 +08:00
wangyong	f249509817	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-14 18:42:27 +08:00
wangyong	c6e0b2007d	alert idc|group length	2015-12-14 18:42:17 +08:00
ibuler	2496f1c654	asset udpate url bug	2015-12-14 18:28:53 +08:00
ibuler	1a32fb5da1	fix del role url bug	2015-12-14 17:13:07 +08:00
ibuler	be2f0b2172	fix log kill and asset detail bug	2015-12-14 16:54:49 +08:00
ibuler	5e5aab7962	fix asset upload bug	2015-12-14 16:26:12 +08:00
ibuler	a8bdc37780	fix group list bug	2015-12-14 15:57:46 +08:00
广宏伟	3260584f90	修改jumpserver.conf注释	2015-12-14 14:52:35 +08:00
ibuler	b58ff14ed1	role fix to sys user	2015-12-14 14:36:42 +08:00
ibuler	db13b7a3e9	主机组列表编辑连接修改	2015-12-12 23:47:28 +08:00
ibuler	3150461d12	bug fix	2015-12-12 23:37:28 +08:00
ibuler	97bfbe24b8	bug fix	2015-12-12 23:09:58 +08:00
ibuler	30b5f74c51	bug fix	2015-12-12 23:01:59 +08:00
ibuler	69aba4643e	bug fix	2015-12-12 22:57:42 +08:00
ibuler	f849ffef3e	url modify	2015-12-12 19:30:39 +08:00
ibuler	6d5513c69e	open in current window	2015-12-11 17:40:52 +08:00
ibuler	b27e2075ff	bug fix	2015-12-11 17:28:01 +08:00
ibuler	9979fdf6de	bugfix	2015-12-11 15:32:06 +08:00
yumaojun	b655b064df	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-11 14:38:24 +08:00
yumaojun	974619d1ce	fixed rule and role detail page not id bug	2015-12-11 14:38:10 +08:00
ibuler	280560f286	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-11 14:03:12 +08:00
wangyong	7ce12af146	fix none bug	2015-12-11 14:02:41 +08:00
ibuler	ba955df493	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-11 11:45:25 +08:00
ibuler	34cbb13b8a	bug fix	2015-12-11 11:45:19 +08:00
yumaojun	aa262d0430	fixed perm page	2015-12-10 22:58:04 +08:00
yumaojun	4294ecaf26	修复了rule 和 role　的detail 页面	2015-12-10 22:56:24 +08:00
ibuler	014d0935ba	bug fix	2015-12-10 21:55:21 +08:00
ibuler	e65cad5074	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-10 17:51:23 +08:00
yumaojun	b0f2b346f9	修复了rule 和 role　的detail 页面	2015-12-10 17:44:45 +08:00
ibuler	affd9aadb5	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-10 14:42:03 +08:00
ibuler	23051a4a05	bug fix	2015-12-10 14:42:01 +08:00
yumaojun	e9fe871af3	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-10 14:40:45 +08:00
yumaojun	80b1bda51c	update...	2015-12-10 14:40:29 +08:00
ibuler	e117cd003f	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-10 14:10:56 +08:00