Commit Graph

1638 Commits (48ba1993e0483d1d863b3fc1ad4e3181400e6c64)

Author SHA1 Message Date
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
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 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 3da43bf01d [Update] 修改资产使用patch方法更新时页面不提示messages信息
6 years ago
BaiJiangJie bb1a941240 [Update] 优化测试可连接性时结果获取 (#2825)
6 years ago
BaiJiangJie d563216e3f [Bugfix] 修复资产没有管理用户时获取connectivity字段失败的bug
6 years ago
BaiJiangJie 9a5c00e148
[Update] 修改文案 (#2823)
6 years ago
BaiJiangJie 152c59365f [Update] 修改资产授权序列类返回资产protocols的协议格式/, 同时添加protocol和port字段
6 years ago
BaiJiangJie 29239e8b77 [Update] 修改小问题
6 years ago
BaiJiangJie 8bead0a33b
[Update] Merge master_bugfix to dev_bugfix (#2817)
6 years ago
ibuler 8a87f316df [Update] 兼容之前的protocols格式
6 years ago
ibuler 2cd092af42 [Update] 修改资产创建格式
6 years ago
老广 10616b8d9e
[Update] serializer mixin继承 (#2810)
6 years ago
ibuler d6165e5975 [Update] 修改assets 的related
6 years ago
BaiJiangJie 9cd75390bf [Update] Auth Info (#2806)
6 years ago
八千流 8adaf629b4 [Update] 增加审计员权限控制 (#2792)
6 years ago
BaiJiangJie c71f417ebf
[Update] 用户授权相关API,如果需要切换到root org (#2803)
6 years ago
BaiJiangJie 795807ddbe
[Bugfix] 和资产相关的Serializer添加protocols字段; (#2800)
6 years ago
BaiJiangJie 7715e62def
[Update] 邮件设置添加配置项:发送账号 (#2796)
6 years ago
BaiJiangJie 5286bf3ac1
[Bugfix] 修复windows推送系统用户小bug (#2794)
6 years ago
老广 ddafd7ba26 Dev ansible windows 2 (#2783)
6 years ago
BaiJiangJie 9f9f22548f [Update] Merge branch master to local dev
6 years ago
八千流 69b91df96b [Update]优化资产设置节点的问题 (#2786)
6 years ago
ibuler 3e86c07411 [Update] 修改授权节点显示
6 years ago
BaiJiangJie eafef9fc7f
Dev (#2785)
6 years ago
老广 44d33f70e4 [Update] 修改授权树显示策略 (#2784)
6 years ago
BaiJiangJie 0574b43971 [Update] 优化前端高度显示css (#2749)
6 years ago
八千流 03d9570895 [Update] 优化用户API,创建用户添加组织关系 (#2776)
6 years ago
八千流 c300f0b549 [Update]优化用户页面的资产标签过滤功能 (#2781)
6 years ago
ibuler 1ba9351957 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 505b801423 [Update] 当授权规则发生改变时刷新所有缓存
6 years ago
BaiJiangJie 4f289963d1 [Update] 修改录像回放判断逻辑 (#2768)
6 years ago
ibuler 9721b805f3 [Update] 解决csv导入导出的问题
6 years ago
ibuler 49632241b6 [Update] 导入解析csv coding
6 years ago
ibuler b4f23f9731 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 1cdcc66dba [Update] 修改excel打开乱码
6 years ago