jumpserver

Author	SHA1	Message	Date
yumaojun	4d844548c2	fixed merge...	2015-11-29 15:50:36 +08:00
ibuler	98f0655da4	fix rule and role bug	2015-11-29 11:33:19 +08:00
yumaojun	b241d6d148	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-11-28 23:00:40 +08:00
yumaojun	b7d9e41b43	1. 修复角色推送 step3 失败	2015-11-28 22:54:59 +08:00
ibuler	3f000b9d54	修改role添加显示	2015-11-28 22:53:27 +08:00
yumaojun	38416fbebb	merge perm	2015-11-28 21:02:23 +08:00
ibuler	c574bbcb96	fix date change bug	2015-11-26 23:26:11 +08:00
ibuler	6fe6342ca4	角色key问题修复	2015-11-25 14:59:57 +08:00
yumaojun	1a0c9cd4e6	1. 新增 PermSudo表, 用于记录 sudo别名 2. 实现Sudo表对应的添加，显示，更新，删除页面 3. 添加角色时，需要选择对应的 sudo别名	2015-11-24 22:03:58 +08:00
yumaojun	6582ee1624	1. 更新和添加（role 和 rule )操作以 msg 的方式刷新页面	2015-11-18 22:32:21 +08:00
yumaojun	e5c1071073	Merge branch 'dev' into map_perm	2015-11-17 14:10:46 +08:00
yumaojun	74b6b4dea2	1. rule push page completed	2015-11-14 21:52:09 +08:00