Commit Graph

4116 Commits (5db704f7931c0defa4072153a181605e420f4c1d)
 

Author SHA1 Message Date
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
BaiJiangJie 0574b43971 [Update] 优化前端高度显示css (#2749)
6 years ago
八千流 03d9570895 [Update] 优化用户API,创建用户添加组织关系 (#2776)
6 years ago
八千流 c300f0b549 [Update]优化用户页面的资产标签过滤功能 (#2781)
6 years ago
BaiJiangJie e5185ebd57
Merge pull request #2770 from jumpserver/dev
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 35a0b42bea
Merge pull request #2769 from jumpserver/dev
6 years ago
BaiJiangJie 4f289963d1 [Update] 修改录像回放判断逻辑 (#2768)
6 years ago
BaiJiangJie 1631c32868
Merge pull request #2767 from jumpserver/dev
6 years ago
ibuler 9721b805f3 [Update] 解决csv导入导出的问题
6 years ago
BaiJiangJie d2b1b19404
Merge pull request #2765 from jumpserver/dev
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
zbhlove100 0a1a260a22
Update README.md
6 years ago
BaiJiangJie 0e377cd0e9
Merge pull request #2762 from jumpserver/dev
6 years ago
BaiJiangJie 3f3cc6359a
[Bugfix] 修复RemoteApp用户列表显示Bug (#2761)
6 years ago
BaiJiangJie eb0a6f00b5
Merge pull request #2758 from jumpserver/dev
6 years ago
BaiJiangJie a87610a8d8
Merge pull request #2757 from jumpserver/dev_bai
6 years ago