6304 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
yumaojun	58082179fe	１. 用户的批量回收, 角色删除会回收推送的角色	2015-12-06 23:44:13 +08:00
ibuler	622611498c	fix bug	2015-12-06 23:33:23 +08:00
ibuler	b346e1c480	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-06 22:00:55 +08:00
ibuler	bf23d6d7aa	fix some bug	2015-12-06 22:00:44 +08:00
kelianchun_miller	3d0b8917fa	update connect.py	2015-12-06 20:56:28 +08:00
yumaojun	8723d673d7	1. 计算该角色有哪些主机没推送时，使用交集计算（原来是差集） ... 2. 修改rule detail页面　不计算，经返回rule 记录的信息 3. 修改role detail页面　不计算，经返回rule 记录的信息 4. 添加了 推送主机上的用户回收功能 5. TODO: 页面的美观展示，与　实现　用户的批量回收。	2015-12-06 18:07:57 +08:00
ibuler	35c818f4a0	用户详情	2015-12-06 00:28:43 +08:00
ibuler	532646a431	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-05 17:55:49 +08:00
ibuler	0fd7b980de	fix some bug	2015-12-05 17:55:45 +08:00
wangyong	2f0e91a538	fix bug	2015-12-05 16:57:47 +08:00
wangyong	0f6f3bdb9a	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-05 16:15:33 +08:00
wangyong	2c3e681942	fix bugs	2015-12-05 16:15:19 +08:00
ibuler	34ccaeb10f	fix push role bug	2015-12-05 12:03:18 +08:00
wangyong	8f985ade97	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-05 11:09:41 +08:00
wangyong	9b7ef1139e	fix bugs	2015-12-05 11:09:34 +08:00
ibuler	2829a7ad31	fix asset admin count	2015-12-04 18:49:17 +08:00
ibuler	b5325fd0ac	bug fix for rule add check	2015-12-04 18:24:20 +08:00
ibuler	69bbdab450	完成上传下载	2015-12-04 13:42:05 +08:00
ibuler	6975acfc8a	文件上传日志	2015-12-03 23:24:34 +08:00
ibuler	9233fef63f	exec log	2015-12-03 19:10:37 +08:00
ibuler	33663783cc	恢复错误修复	2015-12-03 18:49:04 +08:00
ibuler	6f4fd18c47	add	2015-12-03 18:38:06 +08:00
ibuler	7decfdc37f	col-lg -> col-sm to	2015-12-03 18:37:18 +08:00
ibuler	267bb02417	修改exec 和 MyRUnner	2015-12-03 16:53:39 +08:00
ibuler	255e3a043a	修改支持选中执行	2015-12-03 10:38:10 +08:00
ibuler	6080a861db	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-02 23:50:31 +08:00
ibuler	4959073a33	web 批量执行命令	2015-12-02 23:50:20 +08:00
halcyon	f6dbec1436	day update	2015-12-02 23:39:17 +08:00
ibuler	88fbcabcbb	exec-cmd tempalate	2015-12-02 19:17:12 +08:00
ibuler	1f26e49fb8	完成web批量命令执行	2015-12-02 19:16:05 +08:00
ibuler	104ee779e7	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-02 15:42:24 +08:00
ibuler	77da01d1ee	完成上传下载	2015-12-02 15:41:39 +08:00
ibuler	0e6fd89f0b	批量上传下载	2015-12-02 13:35:06 +08:00
halcyon	dd912e8958	asset list and add system_arch	2015-12-01 23:39:49 +08:00
ibuler	e95c47ff6a	upload	2015-12-01 19:23:35 +08:00
ibuler	6b7937c639	普通用户页面	2015-12-01 13:21:42 +08:00
ibuler	f72c5753c9	添加推送	2015-12-01 11:58:11 +08:00
yumaojun	bf98aa5464	sudo push	2015-12-01 11:20:43 +08:00
yumaojun	f3102e3b5b	erge laoguang.	2015-11-30 23:10:31 +08:00
yumaojun	e0aaba2cf5	no change...	2015-11-30 23:08:30 +08:00
ibuler	4b36fc540d	role推送基本完成	2015-11-30 23:04:02 +08:00
yumaojun	7cafbde5b1	update sudo	2015-11-30 22:55:40 +08:00
ibuler	7106e915ef	modify sudo	2015-11-30 19:51:34 +08:00
ibuler	f7c8ad6f38	修改推送用户	2015-11-30 19:06:25 +08:00
Alex Wang	3f451158f0	add choose group to execute commands.	2015-11-30 15:15:05 +08:00
ibuler	8dd4a9fce1	push role 更改	2015-11-29 19:02:13 +08:00
ibuler	52c4395b68	去掉runas	2015-11-29 16:56:39 +08:00
ibuler	49fbae4fad	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-11-29 16:38:48 +08:00
ibuler	2d91f1ab38	校验推送	2015-11-29 16:38:40 +08:00
yumaojun	4d844548c2	fixed merge...	2015-11-29 15:50:36 +08:00