1096 Commits (b0f2b346f965efcce3359c9db8aebf32cbf0acba)

All Branches

Search

Author	SHA1	Message	Date
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
kelianchun_miller	3d4443e1b0	update connect.py ... 命令处理进一步处理	2015-11-14 11:45:56 +08:00
kelianchun_miller	366a5d5737	update connect.py	2015-11-14 11:24:31 +08:00
yumaojun	6d5d279f61	1. 增加授权规则的添加，删除，编辑，详情页面。 ... 2. 修改nav.html中关于授权部分页面。 3. 修改Jasset APP 下的 view，使得数据库中存储的密码是明文。	2015-11-14 10:16:48 +08:00
ibuler	20970db404	修复环境变量大小写，修改terminal类	2015-11-13 21:15:41 +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
halcyon	ec7b543bf2	Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb	2015-11-13 00:06:15 +08:00
halcyon	b7c3cc5532	add idc	2015-11-13 00:03:51 +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
root	3d6d714495	asset alert history	2015-11-10 00:11:54 +08:00
ibuler	adc3703fba	添加绘图	2015-11-10 00:02:56 +08:00
wangyong	6de253df58	delete xlsx	2015-11-09 21:04:47 +08:00
ibuler	f31bea2c70	使用echart	2015-11-09 19:19:28 +08:00
liuzheng712	b61286891f	update	2015-11-09 17:12:57 +08:00
liuzheng712	6db7642331	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ	2015-11-09 16:58:55 +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
halcyon	e77ec102d9	just do it	2015-11-08 22:39:30 +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
liuzheng712	cab346686d	update	2015-11-07 10:27:55 +08:00
liuzheng712	d369d4b50f	Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ ... # Conflicts: # jumpserver/views.py # juser/models.py # juser/views.py # templates/jperm/perm_apply.html	2015-11-07 09:37:10 +08:00
liuzheng712	6897d063c2	error = '用户未激活'	2015-11-07 09:09:36 +08:00
liuzheng712	4ddddc134a	禁用 change to 启用	2015-11-06 23:13:02 +08:00
liuzheng712	44a330ac02	download page: waiting...	2015-11-06 23:04:09 +08:00
liuzheng712	f220ea367e	upload file with user id path	2015-11-06 22:26:19 +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
liuzheng712	7a25f348e4	upload file: save a copy in ./upload/%Y/%M/%D/. TODO: distinguish userID	2015-11-06 00:56:16 +08:00
liuzheng712	12a0a35adf	upload page: need to fix click problem, want to show the list of machines, TODO	2015-11-06 00:21:59 +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