github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,148 Commits
87 Branches
259 Tags
138 MiB
Commit Graph

5148 Commits (403b6fc56372b946441ae5980e625c39d5f93247)

Author SHA1 Message Date
ibuler f528dd4888 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-26 19:00:00 +08:00
ibuler 3c95c6fe11 [Feat] 添加失效用户权限的api 2020-05-26 18:56:03 +08:00
BaiJiangJie 0b17d55f30
Merge pull request #4041 from jumpserver/dev_oidc 
[Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.5
 2020-05-26 14:23:52 +08:00
Bai 3861943518 [Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.5 2020-05-26 14:23:04 +08:00
老广 71a72dd957
Merge pull request #4033 from jumpserver/update-i18n 
[Update] i18n
 2020-05-25 01:53:02 -05:00
老广 78ac1968dd
Merge pull request #4039 from jumpserver/asset_permission-add-field 
[Update] perms.serializers.asset_permission.AssetPermissionSerializer…
 2020-05-25 01:52:35 -05:00
xinwen 93453cc8c3 [Update] perms.serializers.asset_permission.AssetPermissionSerializer 添加字段 2020-05-25 14:50:07 +08:00
xinwen 11527b9033 [Update] i18n 2020-05-22 18:18:40 +08:00
ibuler 2ff2266417 [Update] 修改 SerializerMixin 还原之前的更改 2020-05-21 20:35:44 +08:00
ibuler 6804f23b51 [Update] 修改readme 2020-05-21 20:01:53 +08:00
ibuler ea7e1f19b2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2020-05-21 19:55:36 +08:00
ibuler 3320e6105c [Update] 删掉没用的内容 2020-05-21 19:00:47 +08:00
老广 072e74ce49
Merge pull request #4027 from jumpserver/update-org-user 
[Update] org retrieve api
 2020-05-21 03:15:05 -05:00
xinwen 492b1c4311 [Update] org retrieve api 2020-05-21 16:09:42 +08:00
老广 0babada459
Merge pull request #4025 from jumpserver/update-org-user-add-id 
[Update] orgs.serializers.OrgReadSerializer add `id`
 2020-05-21 02:43:35 -05:00
xinwen 7b0993959e [Update] orgs.serializers.OrgReadSerializer add `id` 2020-05-21 15:40:41 +08:00
ibuler 701582fe38 [Update] 修改license的判断方法 2020-05-21 14:47:00 +08:00
BaiJiangJie 6adf37a30d
Merge pull request #4022 from jumpserver/dev_tran 
[Update] 修改翻译信息
 2020-05-20 19:43:43 +08:00
ibuler b371676813 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-20 19:35:48 +08:00
Bai 2e0eab9289 [Update] 修改翻译信息 2020-05-20 19:35:35 +08:00
ibuler 0cac8d66b3 [Update] 修改index api 2020-05-20 19:35:33 +08:00
BaiJiangJie 2053e9210e
Merge pull request #4021 from jumpserver/dev_asset 
[Bugfix] 修复只显示当前节点下资产不生效的问题
 2020-05-20 18:21:59 +08:00
Bai 7c44f74068 [Bugfix] 修复只显示当前节点下资产不生效的问题 2020-05-20 18:20:01 +08:00
老广 3e0f5af848
Merge pull request #4019 from jumpserver/update-some-i18n 
[Update] 一些本地化
 2020-05-20 05:17:12 -05:00
xinwen 245d28b03d [Update] 一些本地化 2020-05-20 17:45:50 +08:00
Bai 75f4f6d0a2 [Update] 资产授权序列类is_expired, is_valid设置为read_only 2020-05-19 20:50:33 +08:00
Bai f9e167cb0e Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-19 20:36:41 +08:00
Bai f224e49de7 [Update] 去掉资产授权序列类中不存在的字段 2020-05-19 20:36:17 +08:00
BaiJiangJie 4ec4869896
Merge pull request #4012 from jumpserver/dev_permsasset 
[Update] 授权资产树返回org_id字段值
 2020-05-19 19:37:13 +08:00
Bai 63ff868553 [Update] 授权资产树返回org_id字段值 2020-05-19 19:36:19 +08:00
BaiJiangJie 234130091b
Merge pull request #4011 from jumpserver/dev_conf 
[Update] 修改配置文件demo
 2020-05-19 18:38:47 +08:00
Bai 216e0f28b9 [Update] 修改配置文件demo 2020-05-19 18:36:56 +08:00
BaiJiangJie f3483484d7
Merge pull request #4010 from jumpserver/dev_openid 
Dev openid
 2020-05-19 18:35:30 +08:00
Bai d704a35ead [Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.4 2020-05-19 18:33:33 +08:00
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
ibuler 76ef9b292b [Update] 修改public api 2020-05-18 14:55:16 +08:00
ibuler 1540cbdcaa [Update] 修改csv render 2020-05-18 11:52:50 +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