Commit Graph

927 Commits (877383679c80ae6b4a2dbf553019efd904e5360a)
 

Author SHA1 Message Date
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
liuzheng712 96ac65b346 udpate
9 years ago
yumaojun c00e4c24a3 app jperm role and rule bug fixed...
9 years ago
yumaojun 844fe2c250 add asset ok ,pull
9 years ago
yumaojun 6da97c5403 merge dev ...
9 years ago
wangyong 1e41b79611 fix merge bug
9 years ago
ibuler 5d33493233 asset js
9 years ago
ibuler 38c65dbea8 暂时去掉普通用户的get.asset
9 years ago
yumaojun 218ba0d189 merge ...
9 years ago
yumaojun a36294a529 new map
9 years ago
广宏伟 333ee713d4 解决分页bug,和random_pass
9 years ago
广宏伟 b8ae0ed565 some bug fix
9 years ago
ibuler 3b07198b8a merge with cmdb
9 years ago
yumaojun 8b94833ea0 1. role push function use password and public key completed
9 years ago
yumaojun 0862ffef98 merge map
9 years ago
yumaojun 95dc12a71b update models
9 years ago
wangyong 0f29745bfa asset add batch
9 years ago
yumaojun 012950cb68 merge update...
9 years ago
ibuler f9c06c22ae 修改变量命名
9 years ago
yumaojun 83c2704d53 1. update role push
9 years ago
yumaojun 74b6b4dea2 1. rule push page completed
9 years ago
yumaojun f6bc03324f 1. rule operations list add delete edit info page compeleted
9 years ago
kelianchun_miller 3d4443e1b0 update connect.py
9 years ago
kelianchun_miller 366a5d5737 update connect.py
9 years ago
yumaojun 6d5d279f61 1. 增加授权规则的添加,删除,编辑,详情页面。
9 years ago
ibuler 20970db404 修复环境变量大小写,修改terminal类
9 years ago
yumaojun 1eff4ab4ff add edit, detail page
9 years ago
yumaojun 1aed3b4d91 modify add rule html
9 years ago
yumaojun 9379bc1f6e merge failed, update....
9 years ago
yumaojun 9ec2b9ff1d merge filed, update files...
9 years ago
yumaojun 4bfe326868 ansible api add get_host_info in Class Tasks
9 years ago
yumaojun 6074bb033d ansible api add get_host_info in Class Tasks
9 years ago
halcyon ec7b543bf2 Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb
9 years ago
halcyon b7c3cc5532 add idc
9 years ago
Zi Chuanxiu 1c3d642be2 fixed ansible command variables bug.
9 years ago
Zi Chuanxiu a2f84e943a update ansible api
9 years ago
ibuler 4ae36d319c 修复用户信息显示bug
9 years ago
ibuler 7fe0bb21b2 修改无日志记录提示
9 years ago