Commit Graph

352 Commits (7edc9c37f8e0bb29de5c822732e388656bfa571f)

Author SHA1 Message Date
BaiJiangJie 583fd410f5 [Update] 添加迁移文件,修改设置资产可连接性时管理用户为None的bug
6 years ago
ibuler 3e73dbdb11 [Update] 修改小问题
6 years ago
BaiJiangJie d563216e3f [Bugfix] 修复资产没有管理用户时获取connectivity字段失败的bug
6 years ago
ibuler 2cd092af42 [Update] 修改资产创建格式
6 years ago
BaiJiangJie 9cd75390bf [Update] Auth Info (#2806)
6 years ago
老广 ddafd7ba26 Dev ansible windows 2 (#2783)
6 years ago
ibuler 3e86c07411 [Update] 修改授权节点显示
6 years ago
老广 44d33f70e4 [Update] 修改授权树显示策略 (#2784)
6 years ago
ibuler e8ceb58292 [Update] 允许资产ip填写为host地址
6 years ago
BaiJiangJie 1eca517978 [Feature] 添加功能 RemoteApp (#2706)
6 years ago
老广 3855fecc69
Password message (#2702)
6 years ago
ibuler 20ce5d11a6 [Update] 修改排序节点排序规则
6 years ago
ibuler 497cba6b13 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler e2849be72c [Update] 修改节点树排序
6 years ago
zhnxin 35a0ca1875 Update node.py (#2527)
6 years ago
BaiJiangJie c31b169cae [Bugfix] 修复资产对象获取所有节点时的bug
6 years ago
ibuler ae03a5aeb7 [Update] 翻译问题
6 years ago
老广 311538dcf8
Bugfix (#2513)
6 years ago
BaiJiangJie 4e705a52eb [Feature] 添加资产用户管理器 (#2489)
6 years ago
ibuler 9bb58afee1 [Update] bugfix
6 years ago
ibuler 58c4a46f6e [Update] 用户权限增加cache
6 years ago
ibuler 2a5129c481 [Update] 修改支持记录cmd filter日志
6 years ago
ibuler c4af6fa72d [Update] 创建子节点支持id
6 years ago
老广 01a101a710
[Update] 修改一些terminal storage (#2357)
6 years ago
ibuler 7773c30240 [Update] 增加索引
6 years ago
老广 332be54b46
Vnc (#2226)
6 years ago
老广 fe7c3c29ad
[Update] 优化授权协议, 支持vnc (#2220)
6 years ago
老广 a609f17078
[Update] Stash it (#2197)
6 years ago
老广 517a27ea33
Node asset amount (#2191)
6 years ago
老广 b95f8a7d6b
[Update] 修复获取节点数量比较慢的问题 (#2184)
6 years ago
老广 6a23983331
Command (#2142)
6 years ago
ibuler 52e5487e7d [Update] 修改执行命令
6 years ago
老广 d6b22e9ff8
[Update] 修改gateway test connection (#2135)
6 years ago
老广 3d13f3a17d
Command (#2134)
6 years ago
ibuler e38d089056 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 6e19b9d5bc [Update] Luna支持异步加载
6 years ago
BaiJiangJie 5c002e91ee [Update] 修改获取资产distinct
6 years ago
BaiJiangJie 41a8831034 [Bugfix] 修复授权规则下Default节点下的资产不显示
6 years ago
ibuler ebecd00581 [Update] 修改优先级逻辑
6 years ago
ibuler 143fa060d1 [Update] 修改节点信息
6 years ago
ibuler 2c18a27e3a [Update] 修改节点创建规则
6 years ago
ibuler 910dd4e593 [Update] 修改节点生成规则
6 years ago
BaiJiangJie 21c71aba93 [Update] Merge branch dev_cloud_manager (baijiangjie_local) to dev
6 years ago
BaiJiangJie f8db9f480e [Update] 添加翻译-云管理模块
6 years ago
ibuler 532abb86b5 [Update] 添加文案说明和翻译
6 years ago
ibuler 70fa43adaa [Update] 修改一些逻辑
6 years ago
ibuler 44bf01d4ed [Update] 支持命令过滤
6 years ago
ibuler ab848afdb9 [Bugfix] 修复创建节点bug
6 years ago
老广 fe45d839fb
Dev2 (#1766)
6 years ago
ibuler 2ac5786ba1 [Bugfix] 修复Hostname可能不唯一引起的任务执行失败
6 years ago
ibuler 7ddf7f2a79 [Update] 修改cpu的数量问题
6 years ago
ibuler cd2b88caee [Update] 修改节点full value
6 years ago
ibuler 6b86b8b485 [Bugfix] 修复资产数量不对的bug
6 years ago
ibuler 3a4c7846bf [Bugfix] 修改创建第一个节点的Bug
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 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
ibuler f992347fc5 [Update] 修改become信息
7 years ago
ibuler bf9bb1b973 [Update] 修改ops task运行
7 years ago
ibuler 76df1de634 [Bugfix] 修复一些明显的bug
7 years ago
ibuler 3f89701b84 [Bugfix] 修复授权和资产的一部分bug
7 years ago
ibuler b0eace6ad8 [Bugfix] 基本完成assets模块
7 years ago
ibuler 2d0be8f996 [git status
7 years ago
ibuler b97d5b0960 [Feature] assets task 修改
7 years ago
ibuler 08e1788426 [Feature] 打算拆分下载和上传为独立模块,时间有限暂时放弃
7 years ago
ibuler 17ddb3bbbd [Feture] 使用信号解耦
7 years ago
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码
7 years ago
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系
7 years ago
ibuler 0c9e24dc59 [Feture] 添加ops 页面
7 years ago
ibuler 18fd04d63c [Stash] Test case 通不过,import error
7 years ago
ibuler 27a1849b1d [Change] 修改idc => cluster
7 years ago
ibuler 2b3551f1fc [Feature] 修改ansible和ops
7 years ago
ibuler e7f38ec894 [Change] 全部使用uuid作为主键
7 years ago
ibuler 7f9ce57318 修改 terminal上报接口和api
7 years ago
ibuler 3639b190e3 Update perm api
7 years ago
ibuler d73d6e943b update user model charfield max length more than 767 bug
7 years ago
ibuler 477d23ea37 fix some bug
7 years ago
Eli 370cdc275a 添加一个资产,然后推送系统用户时出现(Asset实例无法序列化) (#477)
7 years ago
Caijun b502b06e82 Support i18n for asset `platform` field (#494)
8 years ago
njqaaa dd6c82b168 fix left's users logout (#446)
8 years ago
ibuler 2ec0ab871a Fix form bug
8 years ago
ibuler 695e4da85e [Fixture] 完成批量更新
8 years ago
ibuler 5418d0b44c [Change] Using csv replace xlsx
8 years ago
ibuler c11374ae39 [Bugfix] 修改翻译
8 years ago
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送
8 years ago
ibuler ac3553babb [Fixture] 修改asset detail
8 years ago
ibuler 709552f14c [Fixture] 添加首页
8 years ago
ibuler 4e7b665ea8 [Change] 添加翻译,并添加用户登陆页面
8 years ago
ibuler 10eb13920b [Delete] 删除资产tag
8 years ago
ibuler b60e5a7ee3 [Change] 修改一些view
8 years ago
ibuler 3f72ce4b1f [Update] 更新生成fake数据脚本
8 years ago
ibuler 610c9c5149 Pull it
8 years ago
ibuler 0fbd9843bd [Change] 修改runner, inventory位置
8 years ago
ibuler 915873135e [Fixture] 添加runner run record
8 years ago
ibuler a822f667af [Fixture] 完成用户推送task
8 years ago
xiaokong1937@gmail.com 694899799b trivial changes
8 years ago
ibuler 01e50d592e 完成AdHoc JMSHost JMSInventory
8 years ago
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es
8 years ago
ibuler 49861b6a84 Merge with master
8 years ago
ibuler 70da177ed7 Update api
8 years ago
ibuler 5b4ce709af Add private token and change user group
8 years ago