github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3927 Commits
68 Branches
246 Tags
102 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e08d542c87'
${ noResults }
Commit Graph

645 Commits (e08d542c87c288f8e396c5abf4c369ba61de9550)

Author SHA1 Message Date
ibuler b8ecb6f81d [Update] 用户修改
6 years ago
ibuler 37d89b4ea2 Merge branch 'tmp_org' into org
6 years ago
ibuler 87e0e1f2c4 [Update] Asset返回org name
6 years ago
BaiJiangJie 227cc4e965 [Update] 更新org下普通用户的资产详情 (#1619)
6 years ago
ibuler 23815f87c5 [Update] 升级url
6 years ago
ibuler 492fd98882 [Update] 修改url 为django 2.0 path
6 years ago
BaiJiangJie a10e47f72c Merge branch 'org' into michael_org
6 years ago
BaiJiangJie 8f654c37a9 [Update] Node get_all_assets 过滤游离资产，条件nodes_key=None -> nodes=None
6 years ago
ibuler f4c86718dc [Update] Merge dev
6 years ago
ibuler eca245fdd5 [Bugfix] 修复节点前面有个空目录
6 years ago
ibuler 7e3cf908a1 [Update] 修改get_all_assets
6 years ago
BaiJiangJie 04e7f54c69 [Update] org admin显示资产详情右侧选项卡；修复资产授权添加用户，会显示其他org用户的bug (#1594)
6 years ago
BaiJiangJie d649aacfd6 [Update] asset platform 取消*required (#1595)
6 years ago
ibuler 7e65e44a3c [Update] 兼容guacamole手动模式上传system user是uuid
6 years ago
ibuler 74c3f12275 [Update] 添加脚本，将windows协议改为rdp
6 years ago
ibuler 2ecfecb06f [Update] Merge with dev
6 years ago
ibuler 2abb9efe96 [Update] Org功能修改
6 years ago
老广 36f1165d1b
Tmp org (#1583)
6 years ago
老广 b156f4ad16
Tmp org (#1579)
6 years ago
ibuler f4c31d8e86 [Update] 修改权限判断
6 years ago
老广 c816875f28
[Update] 修改permission (#1574)
6 years ago
老广 2208d6d51e
[Bugfix] 解决Node.root() 死循环，移动AdminRequired到permission中 (#1571)
6 years ago
ibuler e3aa18ff2d [Update] 修改get_current_org 为 proxy对象 current_org
6 years ago
ibuler b5f6f80ae6 [Update] 修改Node
6 years ago
ibuler b6523da603 [Update] 修改外键为org_id
6 years ago
ibuler c24f1a0517 [Update] 修改约束
6 years ago
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
ibuler e873be95d5 [Update] 导入到当前node
7 years ago
ibuler dbaa4ab502 [Update] 修改资产导入的事务问题
7 years ago
ibuler 75319b99ae [Update] 更新ap请求
7 years ago
ibuler 7f4f67aa8d [Update] 支持网域
7 years ago
ibuler fe1862120f [Update] 删掉集群等等
7 years ago
ibuler 2fc9c04228 [Bugfix] 修复更新系统用户后关联节点丢失的问题
7 years ago
ibuler f195b309d4 [Bugfix] 全选后编辑checkbox问题
7 years ago
ibuler 93895b6b92 [Update] 修改一些文案说明和翻译
7 years ago
ibuler e9be4f51e5 [Update] 删除资产详情中的windows等测试连接
7 years ago
ibuler 42f297e6c4 [Update] 更新一些文案
7 years ago
ibuler 8b63961d4d [Update] 默认开启定时检测，运行失败默认log为warn
7 years ago
ibuler 2e8f5919a8 [Update] 默认关闭自动定时推送功能
7 years ago
ibuler 43b4b7c55e [Feature] 资产节点增加批量测试可连接性和更新硬件信息
7 years ago
ibuler f59f03adfd [Update] 支持使用环境变量关闭定时任务
7 years ago
ibuler 9ffb079c8f [Update] 增加修改system user auth 的api
7 years ago
ibuler 88c10e851b [Update] 修改推送任务
7 years ago
ibuler d852f0182b [Update] 修改bug
7 years ago
ibuler 40d2934de0 [Bugfix] 修复首页无法显示数据的bug
7 years ago
ibuler cd9000e7e9 [Update] 修改Node value唯一
7 years ago
ibuler d3e77b09ef [Merge] with doc
7 years ago
ibuler 86c0a2d28b [Update] 修改部分翻译和文档
7 years ago
ibuler e123599735 [Update] 修改一些bug和文案
7 years ago
ibuler bd4f96134f [Update] 修改一些文案
7 years ago
ibuler d284c2175d [Update] 修改一些小问题
7 years ago
ibuler f7ab13952e [Bugfix] 修复bug，修改celery beat版本依赖
7 years ago
ibuler 1018deda96 [Update] 支持拖拽更新
7 years ago
ibuler 31629fc975 [Bugfix] 修复资产禁用还可以登录
7 years ago
ibuler f886e7c2f5 [Update] 修改授权api, windows资产只有rdp协议，linux只有ssh协议
7 years ago
ibuler 91863107d7 [Bugfix] 修复管理用户无法查看的bug
7 years ago
ibuler 870b863136 [Update] 修改设置的一些require
7 years ago
ibuler 9292e48554 [Bugfix] 用户csv导入编码问题
7 years ago
ibuler e2cb128794 [Update] 修改翻译
7 years ago
q4speed 66b8e8bcf8 增加隐藏树功能
7 years ago
ibuler f1c386714d [Update]一些修改
7 years ago
ibuler f0dd7d54c8 [Update] 修改资产model
7 years ago
ibuler 08edda35e1 [Update] 完成资产书
7 years ago
ibuler c8728cace4 [Update] 完成树形改造
7 years ago
ibuler c7296c2498 [Update] 修改系统用户推送，拆分assets的部分模块
7 years ago
ibuler f82d939d15 [Update] 使用资产树，去掉集群和资产组
7 years ago
ibuler 3bb6e08985 [Feature] 更改perms api
7 years ago
ibuler 6104acae8f [Update] 资产列表选中和移除资产
7 years ago
ibuler bd4768c147 [Update] 拆分asset api module
7 years ago
ibuler d047ff3b3a Merge branch 'dev' into tree
7 years ago
liuzheng712 6edd3f6cf8
feat: rdp support
7 years ago
ibuler 114289edaf [Bugfix] 修改创建系统用户的bug
7 years ago
ibuler 2d3967872b [Feature] 完成资产授权和资产添加
7 years ago
ibuler 653c328e84 [Abandon] ...
7 years ago
ibuler 2bc5e882fd [Update] 更改授权规则前commit
7 years ago
ibuler 21a7202587 [Bugfix] 修复ldap认证bug
7 years ago
ibuler a10ff5930f [Update] 修改资产创建
7 years ago
ibuler 017c3ae36a [Update] 修改ztrr
7 years ago
ibuler c4b52cb2a3 [Update] 去掉资产组添加
7 years ago
ibuler 5f2ca58d62 [Bugfix] 修改label api bug
7 years ago
ibuler 1c7212014b [Bugfix] 修改创建label时报错的bug
7 years ago
ibuler 97dd411ab8 [Bugfix] 修复组详情bug
7 years ago
ibuler d2ad10af9a [Bugfix] 修复组详情bug
7 years ago
ibuler 2f06a2b1d3 [Feature] tree增删功能
7 years ago
ibuler 1ac30ed09c [Feature] 使用ztree
7 years ago
ibuler 3603b33a42 [Feature] 添加资产树
7 years ago
ibuler 460fa8e8a9 [Feature] tree
7 years ago
ibuler 9e09a962af [Feature] 支持popover
7 years ago
ibuler 3e62a7f5b7 [Update] 修改认证
7 years ago
ibuler b4f833740e [Bugfix] 资产批量便捷
7 years ago
ibuler 1fbf4ac08c [Update] 删除部分资产属性
7 years ago
ibuler da4c5f48a1 [Update] 修改获取资产信息产生的异常
7 years ago
ibuler 1192e8cdad [Bugfix] 修复系统用户上传秘钥的bug
7 years ago
ibuler bad397e2e6 [Update] 修复获取资产信息异常bug
7 years ago
ibuler 58d22b72ec [Feature] Label 删除修改
7 years ago
ibuler 6d4e9c7d30 [Bugfix] 资产model 太长
7 years ago
ibuler 723805d395 [Bugfix] 修复bsd获取cpu数量bug
7 years ago
ibuler 41756b06e1 [Bugfix] 修复获取kvmcpu的bug
7 years ago
ibuler 9e36a2cbb1 [Update] ansible disk bug
7 years ago
ibuler f0b9a11482 [Update] ansible disk bug
7 years ago
ibuler f6d21585ab [Bugfix] 修复资产搜索bug
7 years ago