Commit Graph

952 Commits (483ca9677c49cab9b74b9ba8164e11993f384283)
 

Author SHA1 Message Date
ibuler 483ca9677c 资产列表添加连接
9 years ago
ibuler f00a2e003d Merge branch 'dev' into exec_cmd
9 years ago
ibuler 0b878216ed Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler f49a92e742 webscoket授权
9 years ago
kelianchun_miller ee218a5fed update connect.py
9 years ago
wangyong a9196ef149 merge cmdb | add asset update batch and crontab
9 years ago
wangyong 04bf37b52a Merge branch 'cmdb' into dev
9 years ago
wangyong 5a3c11f619 asset update batch and crontab
9 years ago
ibuler 12f33176bf Merge branch 'dev' into exec_cmd
9 years ago
ibuler eb779e5bf6 修改run_websocket
9 years ago
ibuler 47ace5d654 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler 70db8c69d2 global SSH_FLAG to self.ssh_flag
9 years ago
kelianchun_miller 5f9e675d00 update connect.py
9 years ago
ibuler 4cdc7f33ce 添加注释
9 years ago
kelianchun_miller c359d1e264 update connect.py
9 years ago
kelianchun_miller 0c42d039ff update connect.py
9 years ago
kelianchun_miller 55503c89e9 update connect.py
9 years ago
wangyong b8cb6f4246 Merge branch 'dev' into cmdb
9 years ago
wangyong d25e23623a fix bugs
9 years ago
ibuler a143797ac9 修改gen_resource api
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