795 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kelianchun_miller	3d4443e1b0	update connect.py ... 命令处理进一步处理	2015-11-14 11:45:56 +08:00
kelianchun_miller	366a5d5737	update connect.py	2015-11-14 11:24:31 +08:00
ibuler	4ae36d319c	修复用户信息显示bug	2015-11-10 16:14:32 +08:00
ibuler	7fe0bb21b2	修改无日志记录提示	2015-11-10 16:00:05 +08:00
ibuler	0174da6c77	修改index页面	2015-11-10 15:50:35 +08:00
ibuler	adc3703fba	添加绘图	2015-11-10 00:02:56 +08:00
ibuler	f31bea2c70	使用echart	2015-11-09 19:19:28 +08:00
ibuler	91b5d039cc	修改邮件settings	2015-11-09 16:28:10 +08:00
ibuler	5692e9dc86	添加资产的默认设置	2015-11-09 11:56:31 +08:00
ibuler	7849ff2b92	解决搜索分页问题	2015-11-09 10:53:15 +08:00
ibuler	7ea23e0fcc	修复无法终结web进程的bug	2015-11-08 12:01:08 +08:00
ibuler	e60a3a697e	添加测试web terminal按钮	2015-11-07 17:41:16 +08:00
ibuler	d899360c34	增加websocket认证	2015-11-07 17:32:32 +08:00
ibuler	98c4d9bdba	web terminal kill方法	2015-11-07 15:27:49 +08:00
ibuler	24730ebd0f	web terminal记录日志	2015-11-07 13:38:50 +08:00
ibuler	43c0770770	使用原生select	2015-11-06 12:09:23 +08:00
ibuler	01d6f751b1	解决实时监控特殊字符，使用term.js	2015-11-06 10:42:10 +08:00
ibuler	9a897e0cf4	修正导入select错误	2015-11-05 20:07:21 +08:00
ibuler	1bc15e57a6	完成webtermial demo	2015-11-05 18:31:00 +08:00
ibuler	618aed3278	移动api中关于tty到connect.py	2015-11-04 17:04:25 +08:00
ibuler	c8c0061244	添加权限鉴定	2015-11-04 16:24:52 +08:00
ibuler	ad4b68a390	Merge branch 'jlog' of git.coding.net:jumpserver/Jumpserver into jlog	2015-11-04 15:21:44 +08:00
kelianchun_miller	a95e313733	update api.py	2015-11-04 15:20:28 +08:00
ibuler	8b25d3e32e	Merge branch 'jlog' of git.coding.net:jumpserver/Jumpserver into jlog	2015-11-04 15:15:03 +08:00
ibuler	a0a7623743	修复log kill和在线查看命令统计	2015-11-04 15:11:14 +08:00
kelianchun_miller	5e20ac0454	update api.py	2015-11-04 14:56:50 +08:00
kelianchun_miller	d182736bd7	update api.py	2015-11-04 14:50:47 +08:00
ibuler	e4ccb1c43f	修复日志打印的异常bug	2015-11-03 23:21:33 +08:00
ibuler	9d75ad6cea	多线程修复监控阻塞bug	2015-11-03 23:03:31 +08:00
ibuler	b30697ea20	基本完成	2015-11-03 19:12:15 +08:00
ibuler	50d21fcdca	for log monitor	2015-11-02 23:20:40 +08:00
ibuler@qq.com	ebe8ce7109	some	2015-11-02 11:18:06 +08:00
广宏伟	73f94fecb5	fix import some bug	2015-10-29 12:01:03 +08:00
ibuler@qq.com	0e24ebdb26	merge with dev	2015-10-29 11:11:05 +08:00
广宏伟	d5bd2143e2	命令搜素完成	2015-10-28 22:32:16 +08:00
liuzheng712	ac5ac5e06b	change role finished , but need more think	2015-10-28 21:03:54 +08:00
ibuler@qq.com	53e4dc7acb	search detail	2015-10-28 19:24:02 +08:00
liuzheng712	4d3e7d694b	lots	2015-10-28 10:55:25 +08:00
liuzheng712	ca271900e6	remove request.session user_id and role_id, about role_id need more think, now is dirty	2015-10-27 23:57:37 +08:00
liuzheng712	f8c8c3deff	update	2015-10-27 23:34:38 +08:00
ibuler@qq.com	76ad67307b	search ok	2015-10-27 23:18:26 +08:00
ibuler@qq.com	ffab7ae697	some	2015-10-27 20:25:18 +08:00
liuzheng712	8e9f22537f	reuse asset_list for host_list	2015-10-27 17:40:53 +08:00
广宏伟	9366003f7b	jlog	2015-10-26 22:17:16 +08:00
ibuler@qq.com	72a18d6abf	use map	2015-10-24 23:52:06 +08:00
ibuler@qq.com	79e81340dc	modify log	2015-10-21 22:39:53 +08:00
ibuler@qq.com	4baffed481	base commit	2015-10-21 21:19:18 +08:00
广宏伟	77131a39d4	recovery playboo_run	2015-10-21 20:53:07 +08:00
广宏伟	40d00f7cbd	lost playboo_run	2015-10-21 20:44:28 +08:00
ibuler@qq.com	fe1f825fdf	perm edit	2015-10-19 23:40:16 +08:00