github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
925 Commits
73 Branches
250 Tags
115 MiB
Commit Graph

137 Commits (dc06426ada5d6d8a59008eb1789c177457cf6a55)

Author SHA1 Message Date
ibuler dc06426ada 完成授权查询api 2015-11-21 12:41:17 +08:00
ibuler 1478ac18fa 用户和组查询api完成 2015-11-21 11:53:36 +08:00
ibuler 558309599c 添加授权查询api 2015-11-21 00:42:54 +08:00
ibuler b8d6c5d007 删除遗留的model SysUser PermLog 2015-11-20 23:12:33 +08:00
ibuler eea56ea0e5 定义通用模块执行 2015-11-20 21:30:57 +08:00
ibuler ab313aacd8 定义Command前 2015-11-20 18:42:44 +08:00
ibuler bddb689e86 merge with exec_cmd 2015-11-19 21:57:17 +08:00
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 04e7073aca 1. fixed ansible api auto load local host file (/etc/ansible/hosts) bug with null list 2015-11-18 19:03:13 +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 79ecbc83ae bug fix 2015-11-18 15:23:56 +08:00
ibuler 2a6051ae35 merge with dev 2015-11-18 15:22:26 +08:00
ibuler cf8e366ae1 修改connect方法 2015-11-18 15:15:08 +08:00
ibuler 8017b1b479 解决jperm key dir 和 ansible api问题 2015-11-17 23:32:24 +08:00
yumaojun e5c1071073 Merge branch 'dev' into map_perm 2015-11-17 14:10:46 +08:00
yumaojun 8d941dc028 update role edit and rule edit 2015-11-17 13:55:13 +08:00
yumaojun 11f6939b85 1. update role and update rule complete. 2015-11-17 13:48:19 +08:00
yumaojun 9d36dc9e39 1. push role bug , because the password push is mandatory, so just the push key is option. 2015-11-16 23:44:53 +08:00
yumaojun c00e4c24a3 app jperm role and rule bug fixed... 2015-11-16 13:49:39 +08:00
yumaojun 6da97c5403 merge dev ... 2015-11-15 23:30:37 +08:00
yumaojun 218ba0d189 merge ... 2015-11-15 22:20:19 +08:00
yumaojun a36294a529 new map 2015-11-15 22:12:28 +08:00
广宏伟 b8ae0ed565 some bug fix 2015-11-15 17:01:02 +08:00
yumaojun 8b94833ea0 1. role push function use password and public key completed 2015-11-15 12:38:57 +08:00
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
yumaojun 6d5d279f61 1. 增加授权规则的添加，删除，编辑，详情页面。 
2. 修改nav.html中关于授权部分页面。
3. 修改Jasset APP 下的 view，使得数据库中存储的密码是明文。
 2015-11-14 10:16:48 +08:00
yumaojun 1eff4ab4ff add edit, detail page 2015-11-13 17:17:22 +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
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
Zi Chuanxiu 82286ea7ed fix set host vars and add set group vars 2015-11-06 11:32:59 +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
Zi Chuanxiu c49a02d1c5 update ansible_api, and update perm_list_user view 2015-11-02 23:07:04 +08:00
Zi Chuanxiu c26594a3ec update ansible_api, and update perm_list_user view 2015-11-02 23:05:19 +08:00
Zi Chuanxiu 6572e6f10e update ansible_api, and update perm_list_user view 2015-11-02 23:03:41 +08:00
Zi Chuanxiu df9d879f22 ansible api base complete... 2015-10-31 11:55:19 +08:00
Zi Chuanxiu dd4ac4e6d6 Task add method push_key 2015-10-30 23:14:45 +08:00
root fe23e61036 Task add method push_key 2015-10-30 23:08:45 +08:00
root b88c4211b2 update ansible_api.py 2015-10-30 08:25:22 +08:00
root 9e0d1a7285 add ansible_api module 2015-10-29 16:32:02 +08:00
ibuler@qq.com 72a18d6abf use map 2015-10-24 23:52:06 +08:00
ibuler@qq.com 79e81340dc modify log 2015-10-21 22:39:53 +08:00
ibuler@qq.com 4baffed481 base commit 2015-10-21 21:19:18 +08:00