Commit Graph

519 Commits (78936bf9f2c29d113b6b31d7072778e288d20a75)

Author SHA1 Message Date
ibuler 790652ff4d [Update] 修改协议小问题
6 years ago
ibuler ff3f74abe6 [Update] 修改api
6 years ago
老广 1a49cf4d9c
Merge pull request #1532 from wojiushixiaobai/dev
6 years ago
ibuler 4d1da56872 [Update] 修改asset api
6 years ago
wojiushixiaobai 696589a3cf 修改url
6 years ago
ibuler 3e17e94245 [Update] 修改资产
6 years ago
ibuler 5648dcd7e7 [Update] 修改用户view
6 years ago
ibuler 28e47f33c1 [Update] 修改一些逻辑
6 years ago
BaiJiangJie 1182313c1a [Update] 取消系统用户-清除认证信息,取消-网关rdp协议认证信息,添加用户unblock功能
6 years ago
ibuler 7412bdcba7 [Update] 完成基本框架
6 years ago
ibuler ad3214641d [Update] 添加org
6 years ago
ibuler 01185a2d07 [Update] 添加gateway api
6 years ago
ibuler 8bfd2be21f [Update] 清除系统用户认证信息时提示
6 years ago
老广 b03ac46df9
Merge pull request #1456 from wojiushixiaobai/dev
6 years ago
ibuler 37bb344166 [Bugfix] 修复网关端口不对的问题
6 years ago
ibuler f8c2a445f7 [Bugfix] 修改gateway port
6 years ago
BaiJiangJie f1f06491d6 [Feature] 添加功能, 支持 telnet server.
7 years ago
wojiushixiaobai 2950613b69 修改提示文字
7 years ago
BaiJiangJie 2e6d238c76 [Bugfix] 修复系统用户选择手动登录,ssh命令行连接获取不到login_mode字段值
7 years ago
BaiJiangJie f5a4370b80 [Update] 系统用户选择手动登录,取消自动推送
7 years ago
BaiJiangJie db2273ef27 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie dd07fa678f [Update] 添加功能,系统用户选择登录模式(自动/手动登录)
7 years ago
ibuler 5579d3f0de [Update] 修复测试网关连接known_host问题
7 years ago
BaiJiangJie 4c4430661b [Merge] Merge branch dev of github.com:jumpserver/jumpserver into github_dev
7 years ago
ibuler 482d1bb27f [Update] 修改permisstion util
7 years ago
ibuler e7c7c3a7a8 Merge branch 'dev' into perm_tree
7 years ago
ibuler a9d1538135 [Update] 修改一些方法
7 years ago
ibuler f8ff223f90 [Update] 更新api和model方法
7 years ago
BaiJiangJie 526943a041 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie e9d0104a69 Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev
7 years ago
BaiJiangJie 7c694c6885 [Update] 合并Node的parent.setter方法,修改node_fake的parent逻辑
7 years ago
ibuler 757a31a52f [Update] 优化asset api, 获取时增加prefetch
7 years ago
BaiJiangJie 5b53cfb4dd [Update] 修改资产树节点(数量)总显示此节点下的资产总数
7 years ago
ibuler b0710c42b0 Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产)
7 years ago
ibuler 47397d2308 [Bugfix] 修复网关测试连接需要ssh信任key的问题
7 years ago
ibuler 7b57d24dc9 [Update] 优化代码
7 years ago
ibuler 0b4df78393 [Update] 修改permistion utils优化返回的属性
7 years ago
BaiJiangJie 2fab69ca61 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie f9ab0abc37 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
ibuler fc2a44621b [Bugfix] 修复右击位置不对的bug
7 years ago
ibuler a96bda8ca9 [Update] 修改树形结构
7 years ago
BaiJiangJie de2416b173 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
ibuler f8384973a1 [Update] 调整Luna的树形结构
7 years ago
ibuler 4b7af1457d [Update] 系统用户新增清除认证的操作
7 years ago
BaiJiangJie c1db33713f [Bugfix] 修复资产授权树root节点bug
7 years ago
老广 e66cfc2e13
Merge pull request #1333 from jumpserver/update_rdp
7 years ago
BaiJiangJie ac67c231fc [Update] 修改前端rdp相关配置的选择逻辑
7 years ago
BaiJiangJie 599431f402 [Update] 去掉添加windows相关配置时的一些无用功能,网域网关/会话列表
7 years ago
ibuler ed18cb317f [Bugfix] 修复创建node api的bug
7 years ago
ibuler cb4afabc91 [Bugfix] 修复创建node节点的问题,修复windows session的问题
7 years ago
BaiJiangJie 718715cc6d [Update] 创建系统用户选择rdp协议,去掉相关配置的一些无用功能
7 years ago
BaiJiangjie 38f8c5bb72 [Bugfix] 修复资产树节点移动,资产授权树节点下的资产显示问题
7 years ago
ibuler ebc1b4975a [Update] 自动生成秘钥去掉密码
7 years ago
ibuler 2da87151ed Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie cbc4a0a97b [Bugfix] 资产树节点Node Value值校验修改异常抛出为400
7 years ago
BaiJiangjie 2583c0b26c [Bugfix] 资产树节点,取消model value unique,并添加唯一性校验,修改新增节点计数器规则
7 years ago
ibuler ebef4f254a Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 116a04da68 Merge branch 'term_js' into dev
7 years ago
ibuler 7de6af89ad [Update] 使用xterm.js替换原来的term.js
7 years ago
ibuler 8e74a04282 [Update] 修改一些bug
7 years ago
BaiJiangjie 3af01d6a31 [Update] 添加功能:资产树显示全部/只显示当前节点下的资产;修复资产树节点主机数与列表显示不一致
7 years ago
ibuler e291ca9057 [Update] 默认关闭定时任务
7 years ago
老广 55096f9ad5
Bugfix perm asset not active (#1273)
7 years ago
老广 6f494ef09c
校验用户名长度和特殊字符 (#1271)
7 years ago
ibuler 5103dab72e [Bugfix] 解决上次引入的bug
7 years ago
ibuler 16aa42a861 [Bugfix] 修复授权树列表和资产树列表不同的bug
7 years ago
ibuler 40a0c4597b Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie 102e1ca97c [Bugfix] 创建资产,资产系统置上,RDP:3389
7 years ago
BaiJiangjie 2823d02763 [Bugfix] 修复资产列表导入,资产id问题
7 years ago
ibuler 9a3d0732bc [Update] 更新授权代码
7 years ago
BaiJiangjie 7a219e1710 [Update] OTP文案修改为MFA
7 years ago
ibuler 947f7d206a [Bugfix] 修复生成system user的问题
7 years ago
ibuler b90d3306c5 [Bugfix] 去掉gateway name连接
7 years ago
ibuler 3ccd54680e [Bugfix] 修改授权详情快速Node更改失效的bug
7 years ago
ibuler 071d14c639 [Update] 修改资产获取select
7 years ago
ibuler 823e879432 [Update] 更新节点移动交互
7 years ago
ibuler 739932b005 [Update] 更新资产导入
7 years ago
ibuler 24f144fdc3 [Bugfix] 修复导入资产时url地址问题
7 years ago
ibuler ee4f5a8194 [Bugfix] 修复资产重复的bug
7 years ago
ibuler 8b3b517bab [Update] 修改授权规则详情列表页面
7 years ago
ibuler 7fc2ef00ee [Update] 修改资产api获取的bug
7 years ago
ibuler bbaa35c773 [Update] 修改Perms
7 years ago
ibuler 84634eb8c0 [Update] 修改Permr认证
7 years ago
ibuler fffa0def9e [Update] 修改api和view
7 years ago
ibuler d0ede246e7 [Update] 修改授权
7 years ago
ibuler 4fa72400be Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie 8504c3d2fd 修复资产列表导出问题
7 years ago
ibuler d966e22cf9 [Update] 修改小bug
7 years ago
ibuler 168335a381 [Update] 更新内容
7 years ago
ibuler 121726b731 Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie 5b65ed8a19 修复导入资产列表IP字段前后有空格问题,导入资产列表时doamin保存为对象
7 years ago
ibuler 951ac252fe [Merge] 更新ansible功能
7 years ago
ibuler 24c4e1df50 [Update] 资产,系统用户,管理用户等支持查看日志
7 years ago
ibuler a4c843ff13 [Update] 迁移celery到ops
7 years ago
ibuler d32f070b5c [Update] 修改Inverntoy,增加更多属性
7 years ago
ibuler 829f57e2d7 [Bugfix] 修复小bug
7 years ago
ibuler c5af4d47eb Merge branch 'some_auth_api' into dev
7 years ago
ibuler c37bfb682a [Update] 添加设置认证api和创建用户时可以不选择组
7 years ago
ibuler d598571dc1 [Update] 添加一个log
7 years ago