6464 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	f760df1e34	角色key问题修复	2015-11-25 16:01:07 +08:00
ibuler	6fe6342ca4	角色key问题修复	2015-11-25 14:59:57 +08:00
liuzheng712	175f2702d1	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	2015-11-25 14:52:30 +08:00
ibuler	a7db713b1e	Merge branch 'exec_cmd' into dev	2015-11-25 10:01:06 +08:00
yumaojun	1a0c9cd4e6	1. 新增 PermSudo表, 用于记录 sudo别名 ... 2. 实现Sudo表对应的 添加，显示，更新，删除页面 3. 添加角色时，需要选择对应的 sudo别名	2015-11-24 22:03:58 +08:00
wangyong	742e56fc5f	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-11-24 19:04:28 +08:00
wangyong	0262d94dd3	fix disk detail bug	2015-11-24 19:04:16 +08:00
ibuler	32d036c2b0	修改setting字段	2015-11-24 17:38:27 +08:00
ibuler	1a63d32fe3	fix bug	2015-11-24 16:31:06 +08:00
ibuler	ec9b00e255	fix bug	2015-11-24 13:37:36 +08:00
ibuler	d7cb549eac	Merge branch 'exec_cmd' into dev	2015-11-24 13:31:55 +08:00
ibuler	168157bfe1	fix	2015-11-24 13:31:48 +08:00
ibuler	7cbb7718eb	fix bug	2015-11-24 12:03:38 +08:00
ibuler	2d65265fc6	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-11-24 12:01:02 +08:00
ibuler	30fe9f5236	fix websocket授权	2015-11-24 11:58:42 +08:00
wangyong	49821062fb	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-11-24 11:22:01 +08:00
wangyong	99439be04f	add update all button	2015-11-24 11:20:01 +08:00
ibuler	17ccac92ee	fix 加密bug	2015-11-24 11:01:54 +08:00
wangyong	dd4c243d7c	Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb	2015-11-24 09:53:50 +08:00
halcyon	34031bfd6b	fix bugs	2015-11-23 23:55:19 +08:00
ibuler	a7a030fedd	fix bug	2015-11-23 23:07:58 +08:00
ibuler	4c50551249	fix some bug	2015-11-23 19:15:52 +08:00
ibuler	483ca9677c	资产列表添加连接	2015-11-23 18:39:38 +08:00
ibuler	f00a2e003d	Merge branch 'dev' into exec_cmd	2015-11-23 15:36:24 +08:00
ibuler	0b878216ed	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-11-23 15:34:34 +08:00
ibuler	f49a92e742	webscoket授权	2015-11-23 15:34:28 +08:00
kelianchun_miller	ee218a5fed	update connect.py	2015-11-23 12:47:02 +08:00
wangyong	a9196ef149	merge cmdb | add asset update batch and crontab	2015-11-23 11:12:14 +08:00
wangyong	04bf37b52a	Merge branch 'cmdb' into dev	2015-11-23 11:06:41 +08:00
wangyong	5a3c11f619	asset update batch and crontab	2015-11-22 23:53:25 +08:00
liuzheng712	c89d43d269	update, now Mac to develop will be all egg pain	2015-11-22 22:20:55 +08:00
ibuler	12f33176bf	Merge branch 'dev' into exec_cmd	2015-11-22 21:59:18 +08:00
ibuler	eb779e5bf6	修改run_websocket	2015-11-22 21:59:07 +08:00
ibuler	47ace5d654	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-11-22 20:47:45 +08:00
ibuler	70db8c69d2	global SSH_FLAG to self.ssh_flag	2015-11-22 20:45:48 +08:00
liuzheng712	962d16172c	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	2015-11-22 20:35:03 +08:00
kelianchun_miller	5f9e675d00	update connect.py	2015-11-22 20:29:35 +08:00
ibuler	4cdc7f33ce	添加注释	2015-11-22 20:20:32 +08:00
kelianchun_miller	c359d1e264	update connect.py	2015-11-22 20:20:04 +08:00
kelianchun_miller	0c42d039ff	update connect.py	2015-11-22 20:18:33 +08:00
kelianchun_miller	55503c89e9	update connect.py	2015-11-22 19:15:58 +08:00
wangyong	b8cb6f4246	Merge branch 'dev' into cmdb	2015-11-22 18:58:31 +08:00
wangyong	d25e23623a	fix bugs	2015-11-22 18:57:47 +08:00
ibuler	a143797ac9	修改gen_resource api	2015-11-22 17:56:38 +08:00
liuzheng712	09de12c02a	index show assets, need discussion	2015-11-22 13:04:11 +08:00
liuzheng712	246e8770ac	http://localhost:8000/juser/user_detail/?id=5001 fix	2015-11-21 22:40:28 +08:00
liuzheng712	ea059790a9	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	2015-11-21 21:24:17 +08:00
liuzheng712	6ae4907520	update	2015-11-21 21:24:01 +08:00
ibuler	5f768444ac	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-11-21 21:07:39 +08:00
ibuler	93481a98db	完成登陆，批量执行命令流	2015-11-21 19:20:11 +08:00