ibuler
|
3320e6105c
|
[Update] 删掉没用的内容
|
5 years ago |
老广
|
072e74ce49
|
Merge pull request #4027 from jumpserver/update-org-user
[Update] org retrieve api
|
5 years ago |
xinwen
|
492b1c4311
|
[Update] org retrieve api
|
5 years ago |
老广
|
0babada459
|
Merge pull request #4025 from jumpserver/update-org-user-add-id
[Update] orgs.serializers.OrgReadSerializer 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
[Update] 一些本地化
|
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
[Update] 修复AssetUserViewSet 使用Option方法时error
|
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
[Update] Asset filter 添加 platform__base 字段
|
5 years ago |
xinwen
|
eb74d13059
|
[Update] Asset filter 添加 platform__base 字段
|
5 years ago |
老广
|
16f916c40a
|
Merge pull request #3992 from jumpserver/update-assets-filter
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
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
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
[Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
|
5 years ago |
Bai
|
7b3647e78a
|
[Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
|
5 years ago |
BaiJiangJie
|
f4f042c407
|
Merge pull request #3987 from jumpserver/master_index
[Update] 仪表盘缓存key添加组织id
|
5 years ago |
Bai
|
0a8eeca629
|
[Update] 仪表盘缓存key添加组织id
|
5 years ago |
BaiJiangJie
|
fdd55511a6
|
Merge pull request #3986 from jumpserver/lina_dev
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 |
ibuler
|
5571651c02
|
[Update] 升级requirements
|
5 years ago |
ibuler
|
2680396680
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
5 years ago |
ibuler
|
227f97c2f5
|
[Update] 修改remote apps 字段
|
5 years ago |
老广
|
ad3231c8a3
|
Merge pull request #3982 from jumpserver/update-ops-migrate
[Update] 重建 ops 0018 迁移脚本
|
5 years ago |
ibuler
|
e39d8dce3c
|
[Update] 修改fields
|
5 years ago |
ibuler
|
0bdc425c55
|
Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
|
5 years ago |
ibuler
|
0a7f63cc5e
|
[Update] 修改remote app api
|
5 years ago |
xinwen
|
c6e0e9a79a
|
[Update] 重建 ops 0018 迁移脚本
|
5 years ago |
BaiJiangJie
|
4cebfc7f6a
|
[Update] 修改翻译 (#3981)
* [Update] 修改翻译
* [Update] 修改翻译2
|
5 years ago |