48 Commits

Author	SHA1	Message	Date
liuzheng712	cf1da2a420	bugfix	2016-03-29 20:56:19 +08:00
liuzheng712	9c38f39e5b	紧急修复监控白屏问题	2016-03-29 17:20:05 +08:00
liuzheng712	6e48fe6357	紧急修复监控白屏问题	2016-03-29 17:16:26 +08:00
ibuler	26804b4093	Merge pull request #174 from jumpserver/dev ... Release 0.3.1 version, Fix most bugs	2016-03-29 11:33:05 +08:00
ibuler	5d0171d5b7	fix(web terminal and log kill) fix close web terminal when not init finished ... when web terminal not init complete, you close the window, online log you will see the log and cann't kill it catch a except fix it	2016-03-28 23:04:30 +08:00
liuzheng712	f3d863ea45	filename	2016-03-28 20:19:49 +08:00
liuzheng712	ebef54ca44	Merge branch 'TermLogRecorder' of github.com:jumpserver/jumpserver into TermLogRecorder	2016-03-27 22:30:04 +08:00
liuzheng712	c937abe098	bugfix	2016-03-27 22:29:39 +08:00
liuzheng712	587c9b2c3f	bugfix	2016-03-27 22:20:20 +08:00
kelianchun_miller	0707b68796	connect.py use TermLog	2016-03-27 22:00:00 +08:00
liuzheng712	445a83f78a	remove this log in loglist	2016-03-27 12:17:02 +08:00
liuzheng712	dc5751951e	disuse pyinotify, use TermLogRecord to record the log and monitor	2016-03-27 11:11:50 +08:00
liuzheng712	9b43c6c238	update	2016-03-25 23:52:48 +08:00
liuzheng712	44b2bcb759	修改日志数据库部分	2016-03-25 22:24:56 +08:00
liuzheng712	8e8d8c9d6a	日志回放OK	2016-03-25 22:19:31 +08:00
ibuler	d7442b4879	Update views.py	2016-03-25 17:36:12 +08:00
liuzheng712	ba5e90abc3	update	2016-03-24 17:17:47 +08:00
liuzheng712	b3f83c3362	update	2016-03-23 22:38:02 +08:00
liuzheng712	17a7470a2a	update_TermLogRecorder	2016-03-23 18:26:23 +08:00
liuzheng712	365a5ccd46	update_TermLogRecorder	2016-03-23 18:25:18 +08:00
liuzheng712	388ebe3bee	update	2016-03-23 17:07:57 +08:00
liuzheng712	52d8825d95	修复tmux等会重复出现命令的bug	2016-03-23 17:05:02 +08:00
liuzheng712	e743ae3dbe	model	2016-03-23 16:36:55 +08:00
ibuler	702b1bd3b7	fix(ws protocal): 修复所有ws自动获取 ... 自动获取websocket无需再手动指定	2016-03-03 18:05:10 +08:00
ibuler	a8eb9f3e79	fix(jlog, websocket url) 修复ws使用 ws协议还是wss协议 ... 1. 不再需要浏览器判断什么协议，需要在jumpserver.conf注明 ref #63	2016-02-27 00:19:04 +08:00
liuzheng712	4d5d56fe79	fix(jlog/views.py): kill bug, because cross domain	2016-02-25 21:07:18 +08:00
Tad Wang	6fbb387488	fix wss support for web_monitor_uri ... Https support	2016-01-21 11:53:56 +08:00
ibuler	39b7a7290f	merge with dev	2015-12-19 17:30:21 +08:00
ibuler	c103738302	merge with dev	2015-12-19 17:26:34 +08:00
ibuler	95cc2830c8	resolve kill process bug	2015-06-09 09:49:31 +08:00
halcyon	27d6df7a38	解决django低版本不支持first()问题	2015-04-21 14:45:38 +08:00
halcyon	84929840d0	bug	2015-04-18 13:51:47 +08:00
halcyon	a269c43d1c	优化	2015-04-16 19:03:02 +08:00
halcyon	55c5230eb2	hehe	2015-04-16 14:32:48 +08:00
halcyon	da4d6b85fc	bugs	2015-04-15 18:47:02 +08:00
halcyon	9cfe6c569d	hehe	2015-04-11 12:52:00 +08:00
halcyon	359f70b9f9	apply	2015-03-26 18:42:52 +08:00
halcyon	fef224459c	鉴权	2015-03-19 18:32:10 +08:00
halcyon	9e1dd270ae	bugs	2015-03-17 13:56:43 +08:00
halcyon	691271c74f	bugs	2015-03-12 18:54:26 +08:00
halcyon	fd490bd685	bugs	2015-03-12 11:03:53 +08:00
halcyon	6c9c560b86	修改各种bug	2015-03-07 17:50:17 +08:00
halcyon	60729c49df	bug	2015-03-07 15:29:49 +08:00
root	e086a03692	bug	2015-03-04 23:14:07 +08:00
halcyon	c84f124511	bug	2015-02-09 19:02:25 +08:00
halcyon	6c70d5bf03	批量添加删除功能实现，修改资产添加修改等	2015-02-01 23:00:23 +08:00
halcyon	d1f6ed4a55	增加日志查看功能	2015-01-25 22:20:07 +08:00
root	37fe5dc4e3	add jlog	2014-12-26 21:57:10 +08:00