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

5114 Commits (f8142e23cdc4e6a29a12773c5df4b27904a3f8fc)

Author SHA1 Message Date
xinwen f8142e23cd
[Fix] 权限管理-> 资产与数据库 Bug (#4049) 2020-05-28 19:08:48 +08:00
Bai 196f1654ab Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-28 17:47:27 +08:00
Bai 3b8a24eeb7 [Update] 添加用户profile public-key序列类 2020-05-28 17:47:18 +08:00
xinwen 7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api (#4040) 
* [Feature] 权限管理-> 远程应用 添加 api

* [Feature] 添加 RelationMixin
 2020-05-28 17:00:42 +08:00
Bai 3e5d949610 [Update] 添加用户profile password序列类 2020-05-28 16:10:28 +08:00
Bai 25c3691f6b Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-28 15:03:07 +08:00
Bai f3bc6c0b22 [Update] 修改用户profile序列类 2020-05-28 15:02:53 +08:00
ibuler caf0d85939 [feat] 修改remote app, database app的过滤参数 2020-05-28 14:47:30 +08:00
ibuler a463f632e8 [Update] 优化重定向 2020-05-27 20:33:09 +08:00
ibuler a0e6d09770 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-27 19:51:45 +08:00
BaiJiangJie 54623a5b06
Merge pull request #4047 from jumpserver/lina_dev 
Lina dev
 2020-05-27 18:46:48 +08:00
Bai 7afff5e392 [Update] merge from dev to lina 2020-05-27 18:44:12 +08:00
ibuler 9a5fee5a4c Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-27 18:03:14 +08:00
ibuler a840e611cd [Update] 修改core 的base url 2020-05-27 18:02:18 +08:00
Bai 566419cac4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina 2020-05-27 17:27:38 +08:00
Bai 7b362bfc76 [Update] 用户序列类添加mfa相关字段 2020-05-27 17:27:28 +08:00
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