24 Commits (c5f9db450d023903d1a01004fdc2214bca5ee85c)

Author	SHA1	Message	Date
ibuler	c103738302	merge with dev	2015-12-19 17:26:34 +08:00
ibuler	1662269153	websocket auth add	2015-05-28 17:00:03 +08:00
ibuler	0beb683c40	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-23 11:23:05 +08:00
root	b134c90bfd	解决阻断报错问题	2015-04-23 11:20:12 +08:00
ibuler	e2ac212fc3	resolve confilict	2015-04-20 20:56:26 +08:00
ibuler	09d3763a02	fix a bug	2015-04-20 20:54:10 +08:00
ibuler	d84ff97019	�޸��Ƴ�bug	2015-04-20 15:56:49 +08:00
ibuler	412dadce76	version 2.0.0 beta	2015-04-20 10:12:11 +08:00
ibuler	6d6e9d97b5	�޸�	2015-04-18 18:04:01 +08:00
ibuler	c1d8de4558	�ϲ���	2015-04-18 16:58:16 +08:00
halcyon	84929840d0	bug	2015-04-18 13:51:47 +08:00
halcyon	55c5230eb2	hehe	2015-04-16 14:32:48 +08:00
halcyon	e72e30bc4e	bug	2015-04-14 21:06:19 +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	92ccd3dc78	jlog	2015-03-17 16:25:32 +08:00
halcyon	9e1dd270ae	bugs	2015-03-17 13:56:43 +08:00
halcyon	fd490bd685	bugs	2015-03-12 11:03:53 +08:00
halcyon	95bb96ebbf	各种bug修改	2015-03-07 18:37:23 +08:00
halcyon	6c9c560b86	修改各种bug	2015-03-07 17:50:17 +08:00
halcyon	60729c49df	bug	2015-03-07 15:29:49 +08:00
halcyon	bbe5b588c0	修改bug	2015-03-04 18:33:38 +08:00
halcyon	c84f124511	bug	2015-02-09 19:02:25 +08:00