Commit Graph

5169 Commits (4d4a10710184f611ede99c4bcf61921a8c717508)
 

Author SHA1 Message Date
Bai 63ff868553 [Update] 授权资产树返回org_id字段值
5 years ago
BaiJiangJie 234130091b
Merge pull request #4011 from jumpserver/dev_conf
5 years ago
Bai 216e0f28b9 [Update] 修改配置文件demo
5 years ago
BaiJiangJie f3483484d7
Merge pull request #4010 from jumpserver/dev_openid
5 years ago
Bai d704a35ead [Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.4
5 years ago
Bai b97deec1de [Update] openid 继续使用配置项 base_site_url
5 years ago
BaiJiangJie 5b6488e1b2
Merge pull request #4008 from jumpserver/dev_bugfix
5 years ago
Bai be3fdac8a9 [Update] 修复API-key不能删除的问题
5 years ago
Bai 96afd82341 [Update] 修复任务列表,执行历史中stat汇总数据显示问题
5 years ago
Bai 728e4b7edd [Update] 修复授权模块的信号处理监听不到的问题
5 years ago
Bai 73c3de97b8 [Update] 取消用户资产页面中,资产详情系统用户值为undefine的问题
5 years ago
Bai e98626988b [Update] 解决开启OpenID,为用户强制启用MFA导致,登录时报错的问题
5 years ago
Bai 01a52812f0 [Update] 修改用户MFA禁用/更新的View
5 years ago
Bai 041d99f0be [Update] 更新remote-app用户/用户组时自动刷新页面
5 years ago
Bai 75edc26a10 [Update] 修改翻译,禁用资产提示不支持ansible的错误提示
5 years ago
Bai 2f7b169405 [Update] 修改授权用户/用户组页面删除用户组失败的问题
5 years ago
ibuler 76ef9b292b [Update] 修改public api
5 years ago
ibuler 1540cbdcaa [Update] 修改csv render
5 years ago
BaiJiangJie eefe0709f8
Merge pull request #4007 from maninhill/patch-1
5 years ago
maninhill 5ae6e81a1d
Update README.md
5 years ago
BaiJiangJie 8a62488cb9
Merge pull request #4003 from jumpserver/dev_v
5 years ago
Bai e951b64b0a [Update] 修改版本号1.5.9
5 years ago
ibuler 5d129fd0da Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler b529127461 [Update] 修改user role
5 years ago
BaiJiangJie 2e40b9607e
Merge pull request #4002 from jumpserver/dev_bai
5 years ago
Bai d878089ebd [Update] 用户资产详情Modal添加comment
5 years ago
BaiJiangJie 9d32285446
Merge pull request #3997 from jumpserver/dev_bai
5 years ago
Bai 4658a4c90f [Update] 修改向导文案
5 years ago
Bai d06ea2944e [Update] 修改Dashboard API
5 years ago
wojiushixiaobai d50ea83f40 [Fix]修改文档链接
5 years ago
ibuler 154aad1e22 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 17163dd909 [Update] 用户Profile添加在当前组织的角色
5 years ago
BaiJiangJie b789a8bb05
Merge pull request #3994 from jumpserver/lina_assetuser
5 years ago
Bai 9341ce9f84 [Update] 修复AssetUserViewSet 使用Option方法时error
5 years ago
ibuler 4d0f7d0254 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 195cbbbe42 [Update] 修改profile serialzier
5 years ago
xinwen 6e5e340a25
Merge pull request #3993 from jumpserver/update-assets-filter
5 years ago
xinwen eb74d13059 [Update] Asset filter 添加 platform__base 字段
5 years ago
老广 16f916c40a
Merge pull request #3992 from jumpserver/update-assets-filter
5 years ago
xinwen 4dd6d4498b [Update] Asset filter 添加 platform__name 字段
5 years ago
ibuler dd5bf546df [Update] 修改serialzier_class
5 years ago
ibuler d6debde566 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler efc66cc7ee [Update] 默认关闭debug
5 years ago
BaiJiangJie b310731ba7
Merge pull request #3990 from jumpserver/lina_dev
5 years ago
Bai 4bd2681bf0 [Update] Merge from dev to lina
5 years ago
BaiJiangJie 38e09753f4
Merge pull request #3989 from jumpserver/dev_master
5 years ago
Bai 98e3adbb11 [Update] Merge from master to dev
5 years ago
BaiJiangJie c700b101c1
Merge pull request #3988 from jumpserver/master_otp
5 years ago
Bai 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
5 years ago
BaiJiangJie f4f042c407
Merge pull request #3987 from jumpserver/master_index
5 years ago