Commit Graph

964 Commits (d7cb549eaca82795b7afd561d7e7d741d575ba3f)
 

Author SHA1 Message Date
liuzheng712 31807b674b Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago
liuzheng712 75fbd9e615 annotation the Asset
9 years ago
liuzheng712 42ec624a91 group add and remove fixed
9 years ago
halcyon b4c13069c0 batch asset alert
9 years ago
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定
9 years ago
halcyon 1471e0a247 merge cmdb and hehe
9 years ago
halcyon a04bb100bf Merge branch 'cmdb' into dev
9 years ago
halcyon f9b1d3059a fix bugs
9 years ago
ibuler bddb689e86 merge with exec_cmd
9 years ago
yumaojun 757f7beeaf update merge conflict.
9 years ago
yumaojun 6582ee1624 1. 更新 和 添加 (role 和 rule )操作 以 msg 的方式 刷新页面
9 years ago
yumaojun 04e7073aca 1. fixed ansible api auto load local host file (/etc/ansible/hosts) bug with null list
9 years ago
yumaojun 2ccd072416 1. delete role filed : is_screty_key
9 years ago
ibuler 79ecbc83ae bug fix
9 years ago
ibuler 2a6051ae35 merge with dev
9 years ago
ibuler cf8e366ae1 修改connect方法
9 years ago
halcyon d42197db3a fix tower bugs
9 years ago
ibuler 8017b1b479 解决jperm key dir 和 ansible api问题
9 years ago
yumaojun 375a243131 Merge remote-tracking branch 'origin/map_perm' into dev
9 years ago
yumaojun 70e6904eb7 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
9 years ago
ibuler 42745c52df Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler 8479989ea8 更换nav ico, 修复需要登陆,登陆后跳转到登陆前页面
9 years ago
liuzheng712 ee7675f7ae fix when ./keys/user/ didn't exist bug
9 years ago
liuzheng712 37b91c40b6 url
9 years ago
liuzheng712 4027a87e7f user delete with alert confirm
9 years ago
liuzheng712 84992746de juser/change_info/ fix password can be ignore
9 years ago
liuzheng712 4397819b44 user.update bug fix
9 years ago
liuzheng712 ee443361b9 bug of user.update
9 years ago
yumaojun e5c1071073 Merge branch 'dev' into map_perm
9 years ago
yumaojun 8d941dc028 update role edit and rule edit
9 years ago
yumaojun 11f6939b85 1. update role and update rule complete.
9 years ago
liuzheng712 1c3b66c1a8 user.update
9 years ago
liuzheng712 a99f024dfc user.update
9 years ago
ibuler d58ba82388 添加ignore
9 years ago
liuzheng712 738c6353ef user.update
9 years ago
ibuler dc547de592 修正文件目录
9 years ago
liuzheng712 adf20f188e user.update
9 years ago
liuzheng712 b9b965753b Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago
liuzheng712 036873e129 merge_dev
9 years ago
yumaojun 9d36dc9e39 1. push role bug , because the password push is mandatory, so just the push key is option.
9 years ago
ibuler ce02d430ba deal_command添加到静态方法中
9 years ago
ibuler 4abf2b06d8 添加jumpserver.conf
9 years ago
ibuler 2d27e3fee0 恢复修改前
9 years ago
ibuler 67771105ae key目录变化
9 years ago
liuzheng712 de9ce6dd19 select all
9 years ago
ibuler 71ef4b079a Merge branch 'dev' of git.coding.net:jumpserver/Jumpserver into dev
9 years ago
ibuler f0d901e136 修复分页bug
9 years ago
liuzheng712 d3dd9d94d3 update
9 years ago
liuzheng712 2938f7e506 update
9 years ago
liuzheng712 1f5fa9a9bd merge
9 years ago