github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3332 Commits
69 Branches
245 Tags
132 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6b86b8b485'
${ noResults }
Commit Graph

503 Commits (6b86b8b485b0a0e1f1d18fa8329df99b0e93fa01)

Author SHA1 Message Date
ibuler 6b86b8b485 [Bugfix] 修复资产数量不对的bug
6 years ago
ibuler e41aad1576 [Bugfix] 修复点击资产报错
6 years ago
ibuler 3a4c7846bf [Bugfix] 修改创建第一个节点的Bug
6 years ago
ibuler b7fcf80fc5 [Update] 优化用户资产页面
6 years ago
ibuler de3695bf97 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 7c814080b2 [Update] 优化一些api
6 years ago
BaiJiangJie f5531b6065 [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644)
6 years ago
ibuler b0aa9f197a [Bugfix] 修复跳转错误的问题
6 years ago
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