Commit Graph

3958 Commits (58182712a2b1afcd9b96bf60cfb503f231cdcfd9)
 

Author SHA1 Message Date
ibuler 58182712a2 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
5 years ago
ibuler 930eb1d2e1 [Update] 修正migrations
5 years ago
BaiJiangJie 98260b5b52 [Update] 修改用户授权资产API返回的queryset
5 years ago
BaiJiangJie 9a3065ad4c [Bugfix] 会话/命令列表中获取用户列表排除app用户
5 years ago
ibuler 79554b47d3 [Update] Merge
5 years ago
ibuler 31d2f2a799 [Update] 去掉原来批量的view
5 years ago
BaiJiangJie 1983533e76 [Bugfix] 修改校验系统用户资产动作权限的API逻辑
5 years ago
ibuler e4880a247f [Update] 修改action
5 years ago
ibuler e43da3d6e1 ipython
5 years ago
ibuler b064be3ec0 [Bugfix] 修复用户页面不走cache的bug
5 years ago
ibuler c33084421d [Update] Debug cache
5 years ago
ibuler 7f7853dbc9 Merge remote-tracking branch 'origin/bugfix' into bugfix
5 years ago
ibuler 4d3856975b [Update] 修改一些bug
5 years ago
BaiJiangJie 8905c27b86 [Update] 修改upgrouped_node key的获取(解决操作日志中出现coco/gua的问题)
5 years ago
ibuler 034fee0f75 [Update] 修改用户有权限的资产
5 years ago
ibuler d41d58e30f [Update] 修改serializer
5 years ago
ibuler ae690050e7 Stash
5 years ago
ibuler 8f699fa366 [Update] 修改Permission
5 years ago
ibuler 8e9b3f134b [Update] 修改permission actions
5 years ago
ibuler 48ba1993e0 Merge remote-tracking branch 'origin/bugfix' into bugfix
5 years ago
ibuler 1a0ff422fe [Update] 优化树结构
5 years ago
BaiJiangJie 5de6563ab2 [Update] 解决连接windows资产出现幽灵会话的问题
5 years ago
ibuler 6d96b5dbaf [Update] 修改org mixin
5 years ago
BaiJiangJie 320b17c8db [Update] Merge local branch dev to master
6 years ago
ibuler e8ebc94191 [Update] 修改assets users api
6 years ago
ibuler f10a7a75ae [Update] 修改用户表结构
6 years ago
ibuler e08d542c87 [Update] 修改users public_key等字段
6 years ago
ibuler 824ba433f6 [Update] 修改表结构
6 years ago
ibuler 327febaf59 [Update] 更改查看认证需要的MFA时间间隔
6 years ago
ibuler 0f8d4f5b32 [Update] 统一可连接性,添加sql debug
6 years ago
ibuler 63216addf6 [Update] 修改connectivity
6 years ago
ibuler 9dd951dd0d [Update] 优化可连接性
6 years ago
BaiJiangJie ed8ae300ae
[Update] 修改org.middleware自动切换组织的bug (#2829)
6 years ago
ibuler 2e6ba2ffb2 [Update] 添加debug
6 years ago
ibuler dd4ef4c383 [Update] 添加重传guacamole的脚本
6 years ago
ibuler ef717f888b Merge branch 'dev' into bugfix
6 years ago
BaiJiangJie b15e06ffec
Merge pull request #2828 from jumpserver/dev_bai2
6 years ago
BaiJiangJie 583fd410f5 [Update] 添加迁移文件,修改设置资产可连接性时管理用户为None的bug
6 years ago
ibuler 3e73dbdb11 [Update] 修改小问题
6 years ago
BaiJiangJie 908905918e
Merge pull request #2827 from jumpserver/dev_bai
6 years ago
BaiJiangJie 3da43bf01d [Update] 修改资产使用patch方法更新时页面不提示messages信息
6 years ago
BaiJiangJie bb1a941240 [Update] 优化测试可连接性时结果获取 (#2825)
6 years ago
BaiJiangJie 4fbb4c6082
Merge pull request #2824 from jumpserver/dev_bai
6 years ago
BaiJiangJie d563216e3f [Bugfix] 修复资产没有管理用户时获取connectivity字段失败的bug
6 years ago
BaiJiangJie 9a5c00e148
[Update] 修改文案 (#2823)
6 years ago
BaiJiangJie 7e16ce41e3
Merge pull request #2820 from jumpserver/dev_perms
6 years ago
BaiJiangJie 152c59365f [Update] 修改资产授权序列类返回资产protocols的协议格式/, 同时添加protocol和port字段
6 years ago
BaiJiangJie 895dfe475c
Merge pull request #2818 from jumpserver/dev_remoteapp
6 years ago
BaiJiangJie 29239e8b77 [Update] 修改小问题
6 years ago
BaiJiangJie 8bead0a33b
[Update] Merge master_bugfix to dev_bugfix (#2817)
6 years ago