5646 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
wangyong	0ebb7c4f9a	merge cmdb	2015-11-21 18:37:40 +08:00
wangyong	652ea98a2b	alert ip -> hostname	2015-11-21 18:28:25 +08:00
ibuler	877383679c	添加api注释	2015-11-21 14:45:20 +08:00
ibuler	e041a49ad7	添加资产权限查询，添加生成resource文件api	2015-11-21 14:42:53 +08:00
ibuler	dc06426ada	完成授权查询api	2015-11-21 12:41:17 +08:00
ibuler	1478ac18fa	用户和组查询api完成	2015-11-21 11:53:36 +08:00
ibuler	558309599c	添加授权查询api	2015-11-21 00:42:54 +08:00
ibuler	40d1eb37dc	Merge branch 'exec_cmd' into dev	2015-11-20 23:12:48 +08:00
ibuler	b8d6c5d007	删除遗留的model SysUser PermLog	2015-11-20 23:12:33 +08:00
ibuler	85a9da0e8a	bug fix	2015-11-20 21:59:09 +08:00
ibuler	faa0275700	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-11-20 21:48:58 +08:00
ibuler	eea56ea0e5	定义通用模块执行	2015-11-20 21:30:57 +08:00
ibuler	ab313aacd8	定义Command前	2015-11-20 18:42:44 +08:00
yumaojun	a88ee0725d	1. 在授权规则添加页面　通过js 给予用户输入提醒	2015-11-20 14:07:17 +08:00
yumaojun	e57c6a9d2e	1. 在授权规则添加页面　通过js 给予用户输入提醒	2015-11-20 14:03:05 +08:00
liuzheng712	f863f4b7ae	登陆web的密码（如不修改请留空）	2015-11-20 11:26:07 +08:00
liuzheng712	4bbae38150	confirm alert	2015-11-20 11:16:47 +08:00
liuzheng712	31807b674b	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	2015-11-20 11:12:10 +08:00