Commit Graph

983 Commits (46245ab4aa79254b398d7c00ae1c7a47dc7e1a13)
 

Author SHA1 Message Date
liuzheng712 6ae4907520 update
9 years ago
ibuler 5f768444ac Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler 93481a98db 完成登陆,批量执行命令流
9 years ago
wangyong 0ebb7c4f9a merge cmdb
9 years ago
wangyong 652ea98a2b alert ip -> hostname
9 years ago
ibuler 877383679c 添加api注释
9 years ago
ibuler e041a49ad7 添加资产权限查询,添加生成resource文件api
9 years ago
ibuler dc06426ada 完成授权查询api
9 years ago
ibuler 1478ac18fa 用户和组查询api完成
9 years ago
ibuler 558309599c 添加授权查询api
9 years ago
ibuler 40d1eb37dc Merge branch 'exec_cmd' into dev
9 years ago
ibuler b8d6c5d007 删除遗留的model SysUser PermLog
9 years ago
ibuler 85a9da0e8a bug fix
9 years ago
ibuler faa0275700 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler eea56ea0e5 定义通用模块执行
9 years ago
ibuler ab313aacd8 定义Command前
9 years ago
yumaojun a88ee0725d 1. 在授权规则添加页面 通过js 给予用户输入提醒
9 years ago
liuzheng712 f863f4b7ae 登陆web的密码(如不修改请留空)
9 years ago
liuzheng712 4bbae38150 confirm alert
9 years ago
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