25 Commits (f1ff52eb6b76a3c4b1d697e1700c4dafd2880d93)

Author	SHA1	Message	Date
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