819 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
yumaojun	012950cb68	merge update...	2015-11-14 23:07:08 +08:00
yumaojun	83c2704d53	1. update role push	2015-11-14 22:54:29 +08:00
yumaojun	74b6b4dea2	1. rule push page completed	2015-11-14 21:52:09 +08:00
yumaojun	f6bc03324f	1. rule operations list add delete edit info page compeleted ... 2. rule operations list add delete edit info page compeleted	2015-11-14 21:13:02 +08:00
yumaojun	6d5d279f61	1. 增加授权规则的添加，删除，编辑，详情页面。 ... 2. 修改nav.html中关于授权部分页面。 3. 修改Jasset APP 下的 view，使得数据库中存储的密码是明文。	2015-11-14 10:16:48 +08:00
yumaojun	1eff4ab4ff	add edit, detail page	2015-11-13 17:17:22 +08:00
yumaojun	1aed3b4d91	modify add rule html	2015-11-13 13:21:57 +08:00
yumaojun	9379bc1f6e	merge failed, update....	2015-11-13 13:06:17 +08:00
yumaojun	9ec2b9ff1d	merge filed, update files...	2015-11-13 12:50:21 +08:00
yumaojun	4bfe326868	ansible api add get_host_info in Class Tasks	2015-11-13 00:34:32 +08:00
yumaojun	6074bb033d	ansible api add get_host_info in Class Tasks	2015-11-13 00:31:27 +08:00
Zi Chuanxiu	1c3d642be2	fixed ansible command variables bug.	2015-11-10 19:55:12 +08:00
Zi Chuanxiu	a2f84e943a	update ansible api	2015-11-10 17:46:44 +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
Zi Chuanxiu	82286ea7ed	fix set host vars and add set group vars	2015-11-06 11:32:59 +08:00
ibuler	01d6f751b1	解决实时监控特殊字符，使用term.js	2015-11-06 10:42:10 +08:00
Zi Chuanxiu	0f8abb6026	update	2015-11-05 22:53:19 +08:00
Zi Chuanxiu	8e2f3fdecd	update	2015-11-05 22:52:02 +08:00
Zi Chuanxiu	26e3634814	mapping model	2015-11-05 22:47:45 +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
Zi Chuanxiu	c49a02d1c5	update ansible_api, and update perm_list_user view	2015-11-02 23:07:04 +08:00
Zi Chuanxiu	c26594a3ec	update ansible_api, and update perm_list_user view	2015-11-02 23:05:19 +08:00
Zi Chuanxiu	6572e6f10e	update ansible_api, and update perm_list_user view	2015-11-02 23:03:41 +08:00
ibuler@qq.com	ebe8ce7109	some	2015-11-02 11:18:06 +08:00