Commit Graph

1175 Commits (227cc4e965314fc7773f6e61a0ca25b3042e3655)

Author SHA1 Message Date
BaiJiangJie 227cc4e965 [Update] 更新org下普通用户的资产详情 (#1619)
6 years ago
ibuler 01bef95e6e Merge remote-tracking branch 'github/org' into org
6 years ago
ibuler 672dd66023 [Bugfix] 修复一些bug
6 years ago
BaiJiangJie 6ce813faf8 [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新,测试连接,str 没有 decode(… (#1613)
6 years ago
ibuler 23815f87c5 [Update] 升级url
6 years ago
ibuler 8afd5ef90a [Merge] 修改一下bug
6 years ago
BaiJiangJie a10e47f72c Merge branch 'org' into michael_org
6 years ago
BaiJiangJie 3dc214d1fa [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug
6 years ago
BaiJiangJie 8f654c37a9 [Update] Node get_all_assets 过滤游离资产,条件nodes_key=None -> nodes=None
6 years ago
ibuler b29a541aa6 [Update] Add init
6 years ago
ibuler 9fd52f6665 [Bugfix] 修复merge引起的bug
6 years ago
ibuler f4c86718dc [Update] Merge dev
6 years ago
老广 4ff7a1f066
Merge pull request #1600 from jumpserver/bai_org
6 years ago
ibuler eca245fdd5 [Bugfix] 修复节点前面有个空目录
6 years ago
ibuler 7e3cf908a1 [Update] 修改get_all_assets
6 years ago
BaiJiangJie 45a354f848 [Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
6 years ago
老广 a48fb9de8d
Tmp org (#1596)
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 8c12c382a5 [Bugfix] 修复merge带来的问题
6 years ago
ibuler 2ecfecb06f [Update] Merge with dev
6 years ago
BaiJiangJie ac238aa36e [Update] 修改用户登录失败限制次数,3->7 (#1586)
6 years ago
ibuler 2abb9efe96 [Update] Org功能修改
6 years ago
BaiJiangJie f17727deb9 [Update] 在线/历史/命令model添加org;修复命令记录保存org失败bug (#1584)
6 years ago
老广 36f1165d1b
Tmp org (#1583)
6 years ago
BaiJiangJie e7c530d8e6 [Update] 添加授权规则org (#1580)
6 years ago
老广 b156f4ad16
Tmp org (#1579)
6 years ago
ibuler e41add6126 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler f4c31d8e86 [Update] 修改权限判断
6 years ago
ibuler 28e8f204ec Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 80f147cf13 [Update] 修改settings
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 bbe4080008 [Update] 删掉Premiddleware
6 years ago
ibuler b6523da603 [Update] 修改外键为org_id
6 years ago
ibuler c24f1a0517 [Update] 修改约束
6 years ago
BaiJiangJie 83f220d7de [Feature] 添加命令记录下载功能 (#1559)
6 years ago
wojiushixiaobai e1fff18ce3 替换淘宝IP查询接口
6 years ago
ibuler c94d018d7e [Bugfix] 修复转义引起的中文乱码问题
6 years ago
ibuler ce1fc0f3e2 [Bugfix] 修复授权列表引起的分页bug
6 years ago
ibuler c215278978 [Bugfix] 修复授权列表引起的分页bug
6 years ago
ibuler fd5f562cbf [Update] stash it
6 years ago
老广 2cb5876d1a
Merge branch 'master' into dev
6 years ago
ibuler 8883e0090f [Update] 更改版本号
6 years ago
ibuler 790652ff4d [Update] 修改协议小问题
6 years ago
ibuler ff3f74abe6 [Update] 修改api
6 years ago