github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,983 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

4983 Commits (b97deec1de68bfaf3847fa7afda89036994ff571)

Author SHA1 Message Date
Bai b97deec1de [Update] openid 继续使用配置项 base_site_url 2020-05-19 18:24:26 +08:00
BaiJiangJie 5b6488e1b2
Merge pull request #4008 from jumpserver/dev_bugfix 
Dev bugfix
 2020-05-19 15:31:10 +08:00
Bai be3fdac8a9 [Update] 修复API-key不能删除的问题 2020-05-19 15:28:31 +08:00
Bai 96afd82341 [Update] 修复任务列表，执行历史中stat汇总数据显示问题 2020-05-19 15:15:17 +08:00
Bai 728e4b7edd [Update] 修复授权模块的信号处理监听不到的问题 2020-05-19 11:47:49 +08:00
Bai 73c3de97b8 [Update] 取消用户资产页面中，资产详情系统用户值为undefine的问题 2020-05-18 18:14:19 +08:00
Bai e98626988b [Update] 解决开启OpenID，为用户强制启用MFA导致，登录时报错的问题 2020-05-18 18:02:37 +08:00
Bai 01a52812f0 [Update] 修改用户MFA禁用/更新的View 2020-05-18 15:49:53 +08:00
Bai 041d99f0be [Update] 更新remote-app用户/用户组时自动刷新页面 2020-05-18 15:40:54 +08:00
Bai 75edc26a10 [Update] 修改翻译，禁用资产提示不支持ansible的错误提示 2020-05-18 15:25:24 +08:00
Bai 2f7b169405 [Update] 修改授权用户/用户组页面删除用户组失败的问题 2020-05-18 15:24:55 +08:00
BaiJiangJie eefe0709f8
Merge pull request #4007 from maninhill/patch-1 
Update README.md
 2020-05-17 07:44:37 +08:00
maninhill 5ae6e81a1d
Update README.md 2020-05-17 00:02:35 +08:00
BaiJiangJie 8a62488cb9
Merge pull request #4003 from jumpserver/dev_v 
[Update] 修改版本号1.5.9
 2020-05-14 16:15:17 +08:00
Bai e951b64b0a [Update] 修改版本号1.5.9 2020-05-14 16:14:17 +08:00
BaiJiangJie 2e40b9607e
Merge pull request #4002 from jumpserver/dev_bai 
[Update] 用户资产详情Modal添加comment
 2020-05-14 14:28:24 +08:00
Bai d878089ebd [Update] 用户资产详情Modal添加comment 2020-05-14 14:26:00 +08:00
BaiJiangJie 9d32285446
Merge pull request #3997 from jumpserver/dev_bai 
[Update] 修改向导文案
 2020-05-14 11:01:35 +08:00
Bai 4658a4c90f [Update] 修改向导文案 2020-05-14 11:00:24 +08:00
wojiushixiaobai d50ea83f40 [Fix]修改文档链接 2020-05-13 15:21:04 +08:00
BaiJiangJie 38e09753f4
Merge pull request #3989 from jumpserver/dev_master 
Dev master
 2020-05-11 17:38:46 +08:00
Bai 98e3adbb11 [Update] Merge from master to dev 2020-05-11 17:38:01 +08:00
BaiJiangJie c700b101c1
Merge pull request #3988 from jumpserver/master_otp 
[Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
 2020-05-11 16:58:40 +08:00
Bai 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug 2020-05-11 16:56:52 +08:00
BaiJiangJie f4f042c407
Merge pull request #3987 from jumpserver/master_index 
[Update] 仪表盘缓存key添加组织id
 2020-05-11 15:20:00 +08:00
Bai 0a8eeca629 [Update] 仪表盘缓存key添加组织id 2020-05-11 15:12:42 +08:00
BaiJiangJie 4cebfc7f6a
[Update] 修改翻译 (#3981) 
* [Update] 修改翻译

* [Update] 修改翻译2
 2020-05-09 13:29:39 +08:00
BaiJiangJie 7e4edc3c63
Merge pull request #3978 from jumpserver/dev_index 
[Update] 修改dashboard中使用的变量名
 2020-05-08 20:03:08 +08:00
Bai 11b3c57c92 [Update] 修改dashboard中使用的变量名 2020-05-08 20:02:00 +08:00
BaiJiangJie 2d48c8028b
Merge pull request #3975 from jumpserver/dev_master 
Dev master
 2020-05-08 16:42:32 +08:00
Bai 185c53d311 [Update] Merge from master to dev 2020-05-08 16:40:07 +08:00
BaiJiangJie 2f030c02ec
Merge pull request #3973 from jumpserver/master_org 
[Update] 优化仪表盘、组织详情页
 2020-05-08 16:27:49 +08:00
老广 f4457ff1e2
Merge pull request #3972 from jumpserver/PERM_CACHE_CONFIG 
Bugfix Perm cache config
 2020-05-08 03:04:33 -05:00
ibuler c6ed6d8acb [Update] 去掉debug信息 2020-05-08 15:58:00 +08:00
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug 2020-05-08 15:53:58 +08:00
Bai e48dbabef2 [Update] 修改翻译 2020-05-08 15:50:01 +08:00
Bai 181973f235 [Update] 优化仪表盘页面加载 2020-05-08 15:41:56 +08:00
ibuler 1936a6d5ee [Update] 去掉perms cache enable settings 2020-05-08 14:25:28 +08:00
ibuler 44a2a51f59 Merge branch 'PERM_CACHE_CONFIG' into dev 2020-05-08 13:13:47 +08:00
ibuler 2d4498578a [Update] 修改授权缓存配置的默认值 2020-05-08 13:13:38 +08:00
BaiJiangJie 5896ea9c63
Merge pull request #3963 from jumpserver/dev_oidc 
[Update] 修改依赖版本jumpserver-django-oidc-rp==0.3.7.3
 2020-05-06 21:06:27 +08:00
Bai 8323de1c07 [Update] 修改依赖版本jumpserver-django-oidc-rp==0.3.7.3 2020-05-06 21:05:23 +08:00
Bai aec78dc3c7 [Update] 添加组织详情->组织用户tab页，解决组织详情页面加载超时问题 2020-05-06 15:31:08 +08:00
BaiJiangJie a860bed34f
[Update] 修改config_example配置（openid） (#3951) 
* [Update] 修改config_example配置（openid）

* [Update] 修改config_example配置（openid）2
 2020-04-29 16:57:10 +08:00
BaiJiangJie 72ccaf7b1c
Merge pull request #3949 from jumpserver/dev_openid 
Dev openid
 2020-04-29 14:25:32 +08:00
Bai e4b788a012 [Update] 修改依赖版本 jumpserver-dajngo-oidc-rp (0.3.7.2) 2020-04-29 14:07:54 +08:00
Bai 6eaba4e2fb [Update] openid配置分块 2020-04-29 14:03:48 +08:00
Bai 23f9454e5d [Update] 修改Url name (oidc => openi) 2020-04-29 01:12:00 +08:00
Bai 9eee79f7d4 [Update] 调整openid backend顺序；openid 用户创建/更新添加日志输出 2020-04-29 00:43:54 +08:00
Bai c0089a98f4 [Update] 修改openid信号名称 2020-04-28 22:29:56 +08:00