8 Commits

Author	SHA1	Message	Date
yumaojun	757f7beeaf	update merge conflict.	2015-11-19 13:20:27 +08:00
yumaojun	6582ee1624	1. 更新 和 添加 （role 和 rule )操作 以 msg 的方式 刷新页面	2015-11-18 22:32:21 +08:00
yumaojun	2ccd072416	1. delete role filed : is_screty_key ... 2. rule edit page add selected mark 3. role add page consider user use_default_auth attribute 4. role password use jumpserver api CRYPTO to crypt 5. fixed ansible api auto load local host file (/etc/ansible/hosts) bug 6. ansible api command and task interface add pattern default argument( pattern='*')	2015-11-18 17:16:29 +08:00
ibuler	8017b1b479	解决jperm key dir 和 ansible api问题	2015-11-17 23:32:24 +08:00
yumaojun	6da97c5403	merge dev ...	2015-11-15 23:30:37 +08:00
yumaojun	8b94833ea0	1. role push function use password and public key completed	2015-11-15 12:38:57 +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
Zi Chuanxiu	26e3634814	mapping model	2015-11-05 22:47:45 +08:00