Commit Graph

4996 Commits (ea7e1f19b26f0e8091a61f34d85122c7c14d6763)
 

Author SHA1 Message Date
ibuler ea7e1f19b2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
BaiJiangJie 6adf37a30d
Merge pull request #4022 from jumpserver/dev_tran
5 years ago
Bai 2e0eab9289 [Update] 修改翻译信息
5 years ago
BaiJiangJie 2053e9210e
Merge pull request #4021 from jumpserver/dev_asset
5 years ago
Bai 7c44f74068 [Bugfix] 修复只显示当前节点下资产不生效的问题
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
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
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
wojiushixiaobai d50ea83f40 [Fix]修改文档链接
5 years ago
ibuler 4d0f7d0254 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
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
Bai 0a8eeca629 [Update] 仪表盘缓存key添加组织id
5 years ago
BaiJiangJie 4cebfc7f6a
[Update] 修改翻译 (#3981)
5 years ago
BaiJiangJie 7e4edc3c63
Merge pull request #3978 from jumpserver/dev_index
5 years ago
Bai 11b3c57c92 [Update] 修改dashboard中使用的变量名
5 years ago
BaiJiangJie 2d48c8028b
Merge pull request #3975 from jumpserver/dev_master
5 years ago
Bai 185c53d311 [Update] Merge from master to dev
5 years ago
BaiJiangJie 2f030c02ec
Merge pull request #3973 from jumpserver/master_org
5 years ago
老广 f4457ff1e2
Merge pull request #3972 from jumpserver/PERM_CACHE_CONFIG
5 years ago
ibuler c6ed6d8acb [Update] 去掉debug信息
5 years ago
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug
5 years ago
Bai e48dbabef2 [Update] 修改翻译
5 years ago
Bai 181973f235 [Update] 优化仪表盘页面加载
5 years ago
ibuler 440a2ad241 Merge branch 'PERM_CACHE_CONFIG' into dev
5 years ago