Commit Graph

4035 Commits (65060a94164fa3e0c31c65d234d509b50eea7c16)
 

Author SHA1 Message Date
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
BaiJiangJie 844f9bf409
Merge pull request #2815 from jumpserver/master_bugfix
6 years ago
BaiJiangJie c17d95dae0 [Update] 修改邮件测试的接受者为发送者
6 years ago
BaiJiangJie 50443de888 [Bugfix] 修复普通用户被授权的RemoteApp列表加载为空的bug
6 years ago
ibuler 04655b9042 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 8a87f316df [Update] 兼容之前的protocols格式
6 years ago
ibuler 2cd092af42 [Update] 修改资产创建格式
6 years ago
BaiJiangJie 7a8e616f17 [Update] 添加一键禁用LDAP认证脚本 (#2813)
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 41a5a69164
[Update] 邮件设置添加配置项:发送账号 (#2795)
6 years ago
BaiJiangJie 5286bf3ac1
[Bugfix] 修复windows推送系统用户小bug (#2794)
6 years ago
老广 ddafd7ba26 Dev ansible windows 2 (#2783)
6 years ago
BaiJiangJie 08a32028c1
Merge pull request #2790 from jumpserver/dev
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