Commit Graph

964 Commits (d7cb549eaca82795b7afd561d7e7d741d575ba3f)
 

Author SHA1 Message Date
ibuler d7cb549eac Merge branch 'exec_cmd' into dev
9 years ago
ibuler 168157bfe1 fix
9 years ago
ibuler 7cbb7718eb fix bug
9 years ago
ibuler 2d65265fc6 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler 30fe9f5236 fix websocket授权
9 years ago
wangyong 49821062fb Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
9 years ago
wangyong 99439be04f add update all button
9 years ago
ibuler 17ccac92ee fix 加密bug
9 years ago
wangyong dd4c243d7c Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb
9 years ago
halcyon 34031bfd6b fix bugs
9 years ago
ibuler a7a030fedd fix bug
9 years ago
ibuler 4c50551249 fix some bug
9 years ago
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