Commit Graph

5326 Commits (34b188bbe7077314cd22e54f3491d4ce49ba7201)
 

Author SHA1 Message Date
BaiJiangJie 087ba9ae95
Merge pull request #4059 from jumpserver/lina
5 years ago
BaiJiangJie 19926e67e1
Merge pull request #4058 from jumpserver/dev
5 years ago
BaiJiangJie af15622319
Merge pull request #4057 from jumpserver/dev_ldap
5 years ago
Bai 9850633350 [Update] 添加LDAP USER_QUERY_FIELD字段值为username,解决数据库因大小敏感导致LDAP用户认证首次成功,再次失败的问题;如果不配置此字段,则查询使用小写,创建可能会使用大写,最终导致username重复而创建用户失败;
5 years ago
ibuler 5f2345852d Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler ad1c17aa7b feat: 仅支持fields_size=mini,small
5 years ago
xinwen 3a79bfd5f6
[Update] 添加一些 i18n (#4052)
5 years ago
Bai 5ee8519274 [Update] 修改AccessKey序列类
5 years ago
Bai ff546774e9 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai 1f4fc9b6f0 [Update] 修改API-Key序列类
5 years ago
xinwen f8142e23cd
[Fix] 权限管理-> 资产与数据库 Bug (#4049)
5 years ago
Bai 196f1654ab Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai 3b8a24eeb7 [Update] 添加用户profile public-key序列类
5 years ago
xinwen 7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api (#4040)
5 years ago
Bai 3e5d949610 [Update] 添加用户profile password序列类
5 years ago
Bai 25c3691f6b Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai f3bc6c0b22 [Update] 修改用户profile序列类
5 years ago
ibuler caf0d85939 [feat] 修改remote app, database app的过滤参数
5 years ago
ibuler a463f632e8 [Update] 优化重定向
5 years ago
ibuler a0e6d09770 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
BaiJiangJie 54623a5b06
Merge pull request #4047 from jumpserver/lina_dev
5 years ago
Bai 7afff5e392 [Update] merge from dev to lina
5 years ago
ibuler 9a5fee5a4c Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler a840e611cd [Update] 修改core 的base url
5 years ago
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
BaiJiangJie 0b17d55f30
Merge pull request #4041 from jumpserver/dev_oidc
5 years ago
Bai 3861943518 [Update] 修改依赖版本号 jumpserver-django-oidc-rp==0.3.7.5
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
老广 1ef1bea703
Merge pull request #4029 from jumpserver/dev
5 years ago
ibuler 6804f23b51 [Update] 修改readme
5 years ago
ibuler ea7e1f19b2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
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
BaiJiangJie d289960ff2
Merge pull request #3998 from jumpserver/dev
5 years ago
BaiJiangJie 6adf37a30d
Merge pull request #4022 from jumpserver/dev_tran
5 years ago
ibuler b371676813 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
Bai 2e0eab9289 [Update] 修改翻译信息
5 years ago
ibuler 0cac8d66b3 [Update] 修改index api
5 years ago
BaiJiangJie 2053e9210e
Merge pull request #4021 from jumpserver/dev_asset
5 years ago