Commit Graph

5064 Commits (566419cac4e5ae84c3f812b16cf4389bdcfe7fc0)
 

Author SHA1 Message Date
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
老广 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 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
ibuler b371676813 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 0cac8d66b3 [Update] 修改index api
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
ibuler 76ef9b292b [Update] 修改public api
5 years ago
ibuler 1540cbdcaa [Update] 修改csv render
5 years ago
ibuler 5d129fd0da Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler b529127461 [Update] 修改user role
5 years ago
Bai d06ea2944e [Update] 修改Dashboard API
5 years ago
ibuler 154aad1e22 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 17163dd909 [Update] 用户Profile添加在当前组织的角色
5 years ago
BaiJiangJie b789a8bb05
Merge pull request #3994 from jumpserver/lina_assetuser
5 years ago
Bai 9341ce9f84 [Update] 修复AssetUserViewSet 使用Option方法时error
5 years ago
ibuler 195cbbbe42 [Update] 修改profile serialzier
5 years ago
xinwen 6e5e340a25
Merge pull request #3993 from jumpserver/update-assets-filter
5 years ago
xinwen eb74d13059 [Update] Asset filter 添加 platform__base 字段
5 years ago
老广 16f916c40a
Merge pull request #3992 from jumpserver/update-assets-filter
5 years ago
xinwen 4dd6d4498b [Update] Asset filter 添加 platform__name 字段
5 years ago
ibuler dd5bf546df [Update] 修改serialzier_class
5 years ago
ibuler d6debde566 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler efc66cc7ee [Update] 默认关闭debug
5 years ago
BaiJiangJie b310731ba7
Merge pull request #3990 from jumpserver/lina_dev
5 years ago
Bai 4bd2681bf0 [Update] Merge from dev to lina
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 fdd55511a6
Merge pull request #3986 from jumpserver/lina_dev
5 years ago
Bai 0cff6ab29b [Update] Merge fromo dev to lina
5 years ago
ibuler cda677a30f [update] 修改remote apps的serializer
5 years ago