Commit Graph

45 Commits (91b3b7ce69d6495a832e668d8d321bd3fe325263)

Author SHA1 Message Date
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 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
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产)
7 years ago
ibuler 7b57d24dc9 [Update] 优化代码
7 years ago
BaiJiangJie de2416b173 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
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 599431f402 [Update] 去掉添加windows相关配置时的一些无用功能,网域网关/会话列表
7 years ago
ibuler cb4afabc91 [Bugfix] 修复创建node节点的问题,修复windows session的问题
7 years ago
BaiJiangjie 38f8c5bb72 [Bugfix] 修复资产树节点移动,资产授权树节点下的资产显示问题
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 8e74a04282 [Update] 修改一些bug
7 years ago
BaiJiangjie 3af01d6a31 [Update] 添加功能:资产树显示全部/只显示当前节点下的资产;修复资产树节点主机数与列表显示不一致
7 years ago
ibuler 5103dab72e [Bugfix] 解决上次引入的bug
7 years ago
ibuler 16aa42a861 [Bugfix] 修复授权树列表和资产树列表不同的bug
7 years ago
ibuler 823e879432 [Update] 更新节点移动交互
7 years ago
ibuler 7fc2ef00ee [Update] 修改资产api获取的bug
7 years ago
ibuler 84634eb8c0 [Update] 修改Permr认证
7 years ago
ibuler 24c4e1df50 [Update] 资产,系统用户,管理用户等支持查看日志
7 years ago
ibuler c5af4d47eb Merge branch 'some_auth_api' into dev
7 years ago
ibuler c37bfb682a [Update] 添加设置认证api和创建用户时可以不选择组
7 years ago
ibuler 75319b99ae [Update] 更新ap请求
7 years ago
ibuler 7f4f67aa8d [Update] 支持网域
7 years ago
ibuler 42f297e6c4 [Update] 更新一些文案
7 years ago
ibuler 43b4b7c55e [Feature] 资产节点增加批量测试可连接性和更新硬件信息
7 years ago
ibuler 9ffb079c8f [Update] 增加修改system user auth 的api
7 years ago
ibuler 1018deda96 [Update] 支持拖拽更新
7 years ago
ibuler f1c386714d [Update]一些修改
7 years ago
ibuler 08edda35e1 [Update] 完成资产书
7 years ago
ibuler c8728cace4 [Update] 完成树形改造
7 years ago
ibuler c7296c2498 [Update] 修改系统用户推送,拆分assets的部分模块
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