Commit Graph

196 Commits (9f9f22548fde6fa2bd3cc3f699c4ddea20e80c35)

Author SHA1 Message Date
BaiJiangJie f5531b6065 [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644)
6 years ago
ibuler 87e0e1f2c4 [Update] Asset返回org name
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
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
老广 36f1165d1b
Tmp org (#1583)
6 years ago
老广 b156f4ad16
Tmp org (#1579)
6 years ago
ibuler f4c31d8e86 [Update] 修改权限判断
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 b6523da603 [Update] 修改外键为org_id
6 years ago
ibuler c24f1a0517 [Update] 修改约束
6 years ago
ibuler 790652ff4d [Update] 修改协议小问题
6 years ago
ibuler 4d1da56872 [Update] 修改asset api
6 years ago
ibuler 3e17e94245 [Update] 修改资产
6 years ago
ibuler 7412bdcba7 [Update] 完成基本框架
6 years ago
ibuler ad3214641d [Update] 添加org
6 years ago
BaiJiangJie f1f06491d6 [Feature] 添加功能, 支持 telnet server.
7 years ago
BaiJiangJie dd07fa678f [Update] 添加功能,系统用户选择登录模式(自动/手动登录)
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 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
ibuler 7b57d24dc9 [Update] 优化代码
7 years ago
ibuler 0b4df78393 [Update] 修改permistion utils优化返回的属性
7 years ago
ibuler a96bda8ca9 [Update] 修改树形结构
7 years ago
ibuler f8384973a1 [Update] 调整Luna的树形结构
7 years ago
ibuler 4b7af1457d [Update] 系统用户新增清除认证的操作
7 years ago
BaiJiangJie 599431f402 [Update] 去掉添加windows相关配置时的一些无用功能,网域网关/会话列表
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 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
老广 55096f9ad5
Bugfix perm asset not active (#1273)
7 years ago
老广 6f494ef09c
校验用户名长度和特殊字符 (#1271)
7 years ago
ibuler 16aa42a861 [Bugfix] 修复授权树列表和资产树列表不同的bug
7 years ago
ibuler 947f7d206a [Bugfix] 修复生成system user的问题
7 years ago
ibuler 071d14c639 [Update] 修改资产获取select
7 years ago
ibuler 24f144fdc3 [Bugfix] 修复导入资产时url地址问题
7 years ago
ibuler ee4f5a8194 [Bugfix] 修复资产重复的bug
7 years ago
ibuler 8b3b517bab [Update] 修改授权规则详情列表页面
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 d966e22cf9 [Update] 修改小bug
7 years ago
ibuler d32f070b5c [Update] 修改Inverntoy,增加更多属性
7 years ago
ibuler 75319b99ae [Update] 更新ap请求
7 years ago
ibuler 7f4f67aa8d [Update] 支持网域
7 years ago
ibuler fe1862120f [Update] 删掉集群等等
7 years ago
ibuler d852f0182b [Update] 修改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 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 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 d047ff3b3a Merge branch 'dev' into tree
7 years ago
liuzheng712 6edd3f6cf8
feat: rdp support
7 years ago
ibuler 2d3967872b [Feature] 完成资产授权和资产添加
7 years ago
ibuler 653c328e84 [Abandon] ...
7 years ago
ibuler 2bc5e882fd [Update] 更改授权规则前commit
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 3603b33a42 [Feature] 添加资产树
7 years ago
ibuler 460fa8e8a9 [Feature] tree
7 years ago
ibuler 1fbf4ac08c [Update] 删除部分资产属性
7 years ago
ibuler b0fab2453a [Merge] 合并标签功能
7 years ago
ibuler 070c3d73cc [Bugfix] git status
7 years ago
ibuler 7433327d75 [Feature] 标签管理功能
7 years ago
ibuler f37b331630 Merge with dev
7 years ago
ibuler 5bbad01909 [Feature] 增加标签
7 years ago
ibuler f1ec53d1bc [Remove] labels
7 years ago
ibuler d3109a03b2 [Bugfix] 修复资产列表显示bug
7 years ago
ibuler 99cd685194 [Bugfix] 默认default cluster
7 years ago
ibuler 22af44211d [Update] set default cluster
7 years ago
ibuler 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产
7 years ago
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮
7 years ago
ibuler 1888c698f1 [Bugfix] 修复一些bug
7 years ago
ibuler 6586bef84c [Modify] Add access log
7 years ago
ibuler 3804ab532d [Update] 修改信号
7 years ago