Commit Graph

747 Commits (de3865fa1dbc4031bd1de56892ba9151120a9efa)

Author SHA1 Message Date
xinwen de3865fa1d refactor(orgs): 重构组织表结构
4 years ago
Bai bb60d2a1d9 fix(users): 组织管理员创建用户时,角色只能选择: 用户
4 years ago
Bai 7c12f8f462 merge: Merge to dev from branch master
4 years ago
xinwen 8eb6cfa9c9
fix(ticket): 修改工单获取系统用户的字段 (#4274)
4 years ago
xinwen f430c9e435
Merge pull request #4270 from jumpserver/request-asset-ticket-dev
4 years ago
Bai a30c603bdc fix(user_group): 用户组中添加用户,取消审计员的限制
4 years ago
xinwen 39a75074af [Feature] 添加申请资产工单
4 years ago
Bai c0a153d13a [Update] UserProfileAPI 判断是否设置session过期时间,解决前端关闭浏览器session未失效的问题
4 years ago
xinwen 32ed43ba7b
Merge branch 'v2.0' into fix-mfa-1.5
4 years ago
xinwen 3e993fd044 [Update] 调整`MFA`绑定策略 V2
4 years ago
xinwen 005573b53b [Fix] 重新绑定 MFA 的漏洞
4 years ago
xinwen 8ad71b6dd9
[Update] Move LOCAL_DYNAMIC_SETTINGS (#4113)
5 years ago
xinwen 7ebe1c2916
[Update] 优化 dynamic settings (#4107)
5 years ago
Bai afa515d570 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai bcba408517 [Update] 修改用户source默认local
5 years ago
ibuler 1f15937139 feat: 修改翻译,添加settings
5 years ago
Bai 927ca162d0 [Update] 修改MFA应用下载图片
5 years ago
Bai b51af1f7d7 [Update] 修改MFA应用下载图片
5 years ago
xinwen 3393f18399 [Update] 修改 用户相关 Serializer
5 years ago
xinwen 7ef09a4ca1
[Update] UserSerializer 添加 login_confirm_settings (#4086)
5 years ago
ibuler 71202e83f5 feat: 修改用户的api
5 years ago
Bai 5730e60089 [Update] 修改用户profile序列类
5 years ago
Bai afc7f3bb9c [Update] 修改用户public_key生成密钥的view
5 years ago
Bai 403b6fc563 [Update] 修改用户更新Public_key的条件判断
5 years ago
Bai 9b2c5cb305 [Update] 修改用户profile序列类3
5 years ago
Bai 907f0068db [Update] 修改用户profile序列类2
5 years ago
Bai a16b3260ba Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
5 years ago
Bai 1845821f6c [Update] 修改用户profile序列类
5 years ago
ibuler 27d906a877 feat: 去掉js i18n catalog
5 years ago
ibuler 5bacab7475 fix: 重置密钥到auth中
5 years ago
ibuler 999286a089 fix: 修复用户公钥错误引起的profile bug
5 years ago
ibuler 68ccaf0cb3 feat: 去掉第一次登录的那个导航
5 years ago
ibuler 8d58d58519 feat: 修改profile view
5 years ago
ibuler 8efc0331de feat: 删掉所有view, templates, forms
5 years ago
ibuler 96551856a2 [Update] 部分view放到auth中
5 years ago
Bai 3b8a24eeb7 [Update] 添加用户profile public-key序列类
5 years ago
Bai 3e5d949610 [Update] 添加用户profile password序列类
5 years ago
Bai f3bc6c0b22 [Update] 修改用户profile序列类
5 years ago
Bai 7afff5e392 [Update] merge from dev to lina
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 3c95c6fe11 [Feat] 添加失效用户权限的api
5 years ago
xinwen 7b0993959e [Update] orgs.serializers.OrgReadSerializer add `id`
5 years ago
ibuler 701582fe38 [Update] 修改license的判断方法
5 years ago
Bai e98626988b [Update] 解决开启OpenID,为用户强制启用MFA导致,登录时报错的问题
5 years ago
Bai 01a52812f0 [Update] 修改用户MFA禁用/更新的View
5 years ago
ibuler 76ef9b292b [Update] 修改public api
5 years ago
ibuler b529127461 [Update] 修改user role
5 years ago
ibuler 17163dd909 [Update] 用户Profile添加在当前组织的角色
5 years ago
ibuler 195cbbbe42 [Update] 修改profile serialzier
5 years ago