Commit Graph

371 Commits (290d584ac96b6ab616820e47ed3f4fb6b6ead59f)

Author SHA1 Message Date
BaiJiangJie 1d30c1900d [Update] 支持Windows批量命令
5 years ago
BaiJiangJie 16f727c60d
[Feature] 添加功能:数据库应用 (#3551)
5 years ago
老广 55c95c58f6 Add new model to operate log (#3546)
5 years ago
老广 e1919d0a62
Asset meta (#3539)
5 years ago
老广 4944ac8e75 Config (#3502)
5 years ago
BaiJiangJie 330c078597 [Update] Merge dev
5 years ago
jym503558564 15b8a2efb9 [Update] 修改小问题
5 years ago
jym503558564 a5485011c8 [Update] 修复网关搜索报500错误;密码为空时,测试连接报500错误
5 years ago
ibuler 82b9c2519b [Update] Merge it
5 years ago
ibuler 2ef487a92f [Update] 修改收集用户
5 years ago
ibuler aa428b0299 [Update] 修改测试网关提示,不能包含特殊字符
5 years ago
老广 0d2fc27a97
Merge pull request #3420 from jumpserver/bugfix
5 years ago
ibuler f4136decde [Update] Stash
5 years ago
BaiJiangJie b51ad05a4b [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)5
5 years ago
BaiJiangJie ca178c534e [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)4
5 years ago
BaiJiangJie d7948425df [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)3
5 years ago
BaiJiangJie a0be7333fb [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)2
5 years ago
BaiJiangJie fde8702916 [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)
5 years ago
ibuler c25335cf95 [Update] 修改authbook
5 years ago
BaiJiangJie e5250294b0 Dev export (#3355)
5 years ago
BaiJiangJie f3dc9b886b Asset favor (#3352)
5 years ago
BaiJiangJie 5f96f8c229 [Update] 优化节点删除 API,添加删除失败原因
5 years ago
ibuler ce530e417c [Update] 修改cmd filter rules pattern
5 years ago
老广 118fc8c42f
Dev beta (#3281)
5 years ago
ibuler 5055a9f352 [Update] 修改获取资产的逻辑
5 years ago
ibuler 28afd1f6f9 [Update] 修改正则表达式
5 years ago
ibuler 6fc666e60d [Update] 优化获取系统用户
5 years ago
ibuler 847e37e641 [Update] 修改一些bug
5 years ago
ibuler b7021b5ecb [Update] 支持收集资产上的用户
5 years ago
ibuler 5464c884db [Update] 修改swagger
5 years ago
ibuler 8ddda8e5af [Update] 修复页面bug和popover的问题
5 years ago
ibuler 444f494c0b [Update] 修改节点资产数量的bug
5 years ago
老广 9bcc325c1e
Bugfix (#3216)
5 years ago
老广 dbb441dfb6
Perm cache (#3211)
5 years ago
老广 8cd8f41cb0
Dev beta (#3167)
5 years ago
老广 1fe18e8073
Bugfix (#3153)
5 years ago
老广 164f48e131
Dev beta (#3048)
5 years ago
ibuler 907d93bcad [Update] 还原一些
5 years ago
ibuler a315df29ca [Update] 暂时不更改这里逻辑
5 years ago
ibuler 2e9711ae8a [Update] 修改nodes
5 years ago
ibuler 05e4e7301c [Update] 修改避免每次刷新asset user的可连接性
5 years ago
BaiJiangJie 4254775149
Bugfix (#3065)
5 years ago
BaiJiangJie 3cdabaf883
[Update] 系统用户资产管理页面获取相关的所有资产 (#3038)
5 years ago
jym503558564 dbb27a7771 [Bugfix] 修复网关测试连接失败未捕获导致报500的bug
5 years ago
jym503558564 48cde91dc1 [Bugfix] 修复命令过滤器名称可重复问题
5 years ago
老广 55b049c86a
Bugfix (#2938)
5 years ago
BaiJiangJie 5f9f970abd
Perf (#2929)
5 years ago
老广 bf5acf7ef1
[Update] 修复系统用户管理用户提及重置密码的bug (#2899)
5 years ago
ibuler 0809916b01 [Update] Merge with master
5 years ago
BaiJiangJie 963b0911cf [Update] 资产model.__all__添加ProtocolsMixin
5 years ago
ibuler aac5eed9fc [Update] 去掉debug
5 years ago
ibuler 3c825440f0 [Update] 优化协议
5 years ago
ibuler 782bad916e Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
5 years ago
ibuler 1472f0437f [update] 修改一些性能问题
5 years ago
八千流 1256944b96 [Bugfix] 修复删除节点bug (#2883)
5 years ago
ibuler 6f570bcbf1 [update] 修改Node无法被删除的bug
5 years ago
ibuler bab4326aeb [Update] 优化节点
5 years ago
ibuler 1448d23ca6 [Update] 准备优化 asset user
5 years ago
ibuler 8e9b3f134b [Update] 修改permission actions
5 years ago
ibuler 1a0ff422fe [Update] 优化树结构
6 years ago
ibuler 6d96b5dbaf [Update] 修改org mixin
6 years ago
BaiJiangJie 9ca4a8c941
Dev (#2838)
6 years ago
ibuler e8ebc94191 [Update] 修改assets users api
6 years ago
ibuler e08d542c87 [Update] 修改users public_key等字段
6 years ago
ibuler 824ba433f6 [Update] 修改表结构
6 years ago
ibuler 0f8d4f5b32 [Update] 统一可连接性,添加sql debug
6 years ago
ibuler 63216addf6 [Update] 修改connectivity
6 years ago
ibuler 9dd951dd0d [Update] 优化可连接性
6 years ago
ibuler ef717f888b Merge branch 'dev' into bugfix
6 years ago
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