6002 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	db13b7a3e9	主机组列表编辑连接修改	2015-12-12 23:47:28 +08:00
ibuler	3150461d12	bug fix	2015-12-12 23:37:28 +08:00
ibuler	97bfbe24b8	bug fix	2015-12-12 23:09:58 +08:00
ibuler	30b5f74c51	bug fix	2015-12-12 23:01:59 +08:00
ibuler	69aba4643e	bug fix	2015-12-12 22:57:42 +08:00
ibuler	f849ffef3e	url modify	2015-12-12 19:30:39 +08:00
ibuler	6d5513c69e	open in current window	2015-12-11 17:40:52 +08:00
ibuler	b27e2075ff	bug fix	2015-12-11 17:28:01 +08:00
ibuler	9979fdf6de	bugfix	2015-12-11 15:32:06 +08:00
yumaojun	b655b064df	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-11 14:38:24 +08:00
yumaojun	974619d1ce	fixed rule and role detail page not id bug	2015-12-11 14:38:10 +08:00
ibuler	280560f286	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-11 14:03:12 +08:00
wangyong	7ce12af146	fix none bug	2015-12-11 14:02:41 +08:00
ibuler	b7bf6b4cc0	Merge pull request #23 from hailwind/master ... add choose group to execute commands. 增加组执行命令功能	2015-12-11 12:05:15 +08:00
ibuler	ba955df493	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-11 11:45:25 +08:00
ibuler	34cbb13b8a	bug fix	2015-12-11 11:45:19 +08:00
yumaojun	aa262d0430	fixed perm page	2015-12-10 22:58:04 +08:00
yumaojun	4294ecaf26	修复了rule 和 role　的detail 页面	2015-12-10 22:56:24 +08:00
ibuler	014d0935ba	bug fix	2015-12-10 21:55:21 +08:00
ibuler	e65cad5074	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-10 17:51:23 +08:00
yumaojun	b0f2b346f9	修复了rule 和 role　的detail 页面	2015-12-10 17:44:45 +08:00
ibuler	affd9aadb5	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-10 14:42:03 +08:00
ibuler	23051a4a05	bug fix	2015-12-10 14:42:01 +08:00
yumaojun	e9fe871af3	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-10 14:40:45 +08:00
yumaojun	80b1bda51c	update...	2015-12-10 14:40:29 +08:00
ibuler	e117cd003f	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-10 14:10:56 +08:00
ibuler	e03b4722b0	defend attack	2015-12-10 14:10:47 +08:00
yumaojun	b5a3fb44c3	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-10 01:15:46 +08:00
yumaojun	4903a17104	Merge branch 'map_perm' into dev ... # Conflicts: # jperm/ansible_api.py # jperm/views.py	2015-12-10 01:15:25 +08:00
yumaojun	a068498561	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev ... # Conflicts: # jperm/ansible_api.py	2015-12-10 00:17:01 +08:00
halcyon	1a3541e575	fix bugs	2015-12-10 00:13:50 +08:00
yumaojun	49267b57e4	1. 角色添加和角色修改, Server 端　输入验证 ... 2. 日志打印	2015-12-10 00:10:39 +08:00
ibuler	d337b929ef	perm edit fix	2015-12-09 17:27:13 +08:00
ibuler	f74b15c1bf	perm edit fix	2015-12-09 16:42:48 +08:00
ibuler	d3fd9e05ca	ansible api fix	2015-12-09 14:50:48 +08:00
ibuler	16b94c1089	bug fix	2015-12-09 11:49:30 +08:00
ibuler	d6b4c7c485	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-08 23:19:42 +08:00
ibuler	0309213ccc	bug fix	2015-12-08 23:19:39 +08:00
ibuler	e408414631	bug fix	2015-12-08 19:25:11 +08:00
kelianchun_miller	80ffb9d762	update connect.py	2015-12-08 11:44:42 +08:00
ibuler	bd2a3e6119	bugfix	2015-12-08 11:32:27 +08:00
ibuler	95e8115045	bug fix	2015-12-07 23:29:19 +08:00
ibuler	b7cfac4d1f	bug fix	2015-12-07 23:21:10 +08:00
ibuler	5be2633795	bug fix	2015-12-07 18:06:07 +08:00
ibuler	cb12b83e47	bug fix	2015-12-07 17:41:29 +08:00
ibuler	cd798daf0a	bug fix	2015-12-07 17:30:57 +08:00
wangyong	7f6f46b662	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-06 23:48:46 +08:00
wangyong	e78d7b0219	cu asset page and sth	2015-12-06 23:48:39 +08:00
yumaojun	58082179fe	１. 用户的批量回收, 角色删除会回收推送的角色	2015-12-06 23:44:13 +08:00
ibuler	622611498c	fix bug	2015-12-06 23:33:23 +08:00