340 Commits

Author	SHA1	Message	Date
ibuler	e60a3a697e	添加测试web terminal按钮	2015-11-07 17:41:16 +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	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	a0a7623743	修复log kill和在线查看命令统计	2015-11-04 15:11:14 +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
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	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
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	50d2bfb272	someday	2015-10-12 09:58:38 +08:00
ibuler@qq.com	06eedff49f	fix common	2015-10-07 20:14:07 +08:00
ibuler@qq.com	afbbad1604	授权管理	2015-10-07 17:16:20 +08:00
ibuler@qq.com	e99b33c51e	修改使用新表结构	2015-10-06 23:47:53 +08:00
Administrator	43fe985143	添加组授权	2015-10-06 18:51:49 +08:00
Administrator	699046dad5	修改settings	2015-10-05 23:48:03 +08:00
guanghongwei	9f7b066ca6	shouquanxiugai	2015-10-04 21:50:29 +08:00
liuzheng712	79c79432f5	usermodle	2015-09-15 23:38:06 +08:00
ibuler	d32ea9f9a1	授权管理	2015-09-11 00:04:07 +08:00
ibuler	907c2c7e97	资产修改基本完成	2015-09-10 22:51:42 +08:00
ibuler	8bf9103fcf	修改资产管理	2015-09-09 00:19:17 +08:00
ibuler	4eb78e151e	用户模块修改告一段落	2015-09-06 21:37:22 +08:00
ibuler	3efd810fe1	修改修改用户bug	2015-09-02 21:42:31 +08:00
ibuler	c21cdc2131	添加忘记密码	2015-08-31 23:04:53 +08:00
ibuler	44c69ded78	干掉ldap前	2015-08-30 14:03:10 +08:00
root	1e170714c0	修改用户添加视图	2015-08-29 00:09:36 +08:00
ibuler	10d96a9767	修改用户组视图	2015-08-28 00:33:54 +08:00
ibuler	33c624c76f	删除部门后	2015-08-27 00:08:20 +08:00
ibuler	913f93b91f	删除部门前	2015-08-26 23:31:32 +08:00
ibuler	1662269153	websocket auth add	2015-05-28 17:00:03 +08:00
ibuler	ce99bf2266	placeholder	2015-05-25 18:35:32 +08:00
ibuler	1952d1ca23	modify sudo show	2015-05-25 18:27:57 +08:00
ibuler	6d34bd45d2	modify nav_bar_header.html	2015-04-24 20:42:15 +08:00
ibuler	992947ac99	modify service.sh bug	2015-04-24 20:39:44 +08:00
ibuler	ba55cdde87	modify service.sh bug	2015-04-24 19:12:14 +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	311b65da00	�޸�bug	2015-04-22 18:57:55 +08:00