Commit Graph

5102 Commits (54623a5b0673f5d1fac61476caa95c47bb76e2bd)
 

Author SHA1 Message Date
BaiJiangJie 54623a5b06
Merge pull request #4047 from jumpserver/lina_dev
5 years ago
Bai 7afff5e392 [Update] merge from dev to lina
5 years ago
Bai 566419cac4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai 7b362bfc76 [Update] 用户序列类添加mfa相关字段
5 years ago
ibuler f528dd4888 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 3c95c6fe11 [Feat] 添加失效用户权限的api
5 years ago
BaiJiangJie 0b17d55f30
Merge pull request #4041 from jumpserver/dev_oidc
5 years ago
Bai 3861943518 [Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.5
5 years ago
老广 71a72dd957
Merge pull request #4033 from jumpserver/update-i18n
5 years ago
老广 78ac1968dd
Merge pull request #4039 from jumpserver/asset_permission-add-field
5 years ago
xinwen 93453cc8c3 [Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段
5 years ago
xinwen 11527b9033 [Update] i18n
5 years ago
ibuler 2ff2266417 [Update] 修改 SerializerMixin 还原之前的更改
5 years ago
ibuler 6804f23b51 [Update] 修改readme
5 years ago
ibuler ea7e1f19b2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 3320e6105c [Update] 删掉没用的内容
5 years ago
老广 072e74ce49
Merge pull request #4027 from jumpserver/update-org-user
5 years ago
xinwen 492b1c4311 [Update] org retrieve api
5 years ago
老广 0babada459
Merge pull request #4025 from jumpserver/update-org-user-add-id
5 years ago
xinwen 7b0993959e [Update] orgs.serializers.OrgReadSerializer add `id`
5 years ago
ibuler 701582fe38 [Update] 修改license的判断方法
5 years ago
BaiJiangJie 6adf37a30d
Merge pull request #4022 from jumpserver/dev_tran
5 years ago
ibuler b371676813 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
Bai 2e0eab9289 [Update] 修改翻译信息
5 years ago
ibuler 0cac8d66b3 [Update] 修改index api
5 years ago
BaiJiangJie 2053e9210e
Merge pull request #4021 from jumpserver/dev_asset
5 years ago
Bai 7c44f74068 [Bugfix] 修复只显示当前节点下资产不生效的问题
5 years ago
老广 3e0f5af848
Merge pull request #4019 from jumpserver/update-some-i18n
5 years ago
xinwen 245d28b03d [Update] 一些本地化
5 years ago
Bai 75f4f6d0a2 [Update] 资产授权序列类is_expired, is_valid设置为read_only
5 years ago
Bai f9e167cb0e Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai f224e49de7 [Update] 去掉资产授权序列类中不存在的字段
5 years ago
BaiJiangJie 4ec4869896
Merge pull request #4012 from jumpserver/dev_permsasset
5 years ago
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