github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9976 Commits
68 Branches
246 Tags
102 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e416a5d5d7'
${ noResults }
Commit Graph

1040 Commits (e416a5d5d7a4b355b9618fc6b6442fd7d94fc735)

Author SHA1 Message Date
Jiangjie.Bai 83ff8dbf26
fix: rbac 合并 (#7658)
3 years ago
fit2bot 63de4e1806
perf: 添加 is_org_admin (#7644)
3 years ago
ibuler 48d0c7b6cc fix: 修复 org members 的问题
3 years ago
ibuler db050e405d fix: 修改 migrations
3 years ago
fit2bot e259d2a9e9
fix: fix rbac to dev (#7636)
3 years ago
halo e1de210585 feat: 创建用户邮件内容支持html标签
3 years ago
halo 3f6c9d519e fix: 修复通知用户过期时间bug
3 years ago
ibuler b92530f0b9 perf: 优化通知，对支持 markdown 的发 markdown
3 years ago
ibuler 19ecc7fef6 fix: 修复 otp 返回时报错
3 years ago
fit2bot 3962af7c4f
feat: 支持saml2协议的单点登录，合并代码 (#7347)
3 years ago
feng626 adb9f01231 feat: 密码计划邮件提醒
3 years ago
ibuler 62cbca7eb2 fix: 修复重置 mfa 的提示问题
3 years ago
ibuler 7f0ad7e27f fix: 修复 oidc cas 登录时跳转问题
3 years ago
feng626 599d58e9f2 fix: 修复重置mfa 500 bug
3 years ago
feng626 67d084fc43 perf: ip list 优化
3 years ago
feng626 24d0d52a0a perf: 优化ip黑白名单
3 years ago
fit2bot 086ecfc046
perf: 优化全局ip限制逻辑 (#7220)
3 years ago
ibuler cc2d47e6dc perf: 修复首页登录mfa错误提示
3 years ago
ibuler 12a0096963 fix: 修复重置mfa的bug
3 years ago
xinwen 9a7919f3ac fix: 更新公钥消息不对
3 years ago
feng626 90477146ed feat: 添加全局ip黑名单
3 years ago
fit2bot 17303c0550
pref: 优化MFA (#7153)
3 years ago
ibuler bbe2678df3 perf: 优化用户创建邮件信息，支持部分标签
3 years ago
ibuler d44656aa10 fix: 修复修改用户信息后，绑定丢失
3 years ago
fit2bot f88e5de3c1
perf: 优化用户创建邮件 (#7072)
3 years ago
fit2bot c244cf5f43
pref: 修改使用的消息内容 (#7061)
3 years ago
Michael Bai 06de6c3575 fix: 修复资产系统用户auth-info获取流程及创建时手动登录方式的校验
3 years ago
ibuler 487c945d1d perf: 修改代码位置，用户sugestion增加到6个
3 years ago
feng626 c5f6c564a7 fix: 系统启动bug
3 years ago
fit2bot 00d434ceea
perf: 优化消息通知 (#7024)
3 years ago
fit2bot 9acfd461b4
feat: user login acl (#6963)
3 years ago
fit2bot 63638ed1ce
feat: 首页的 chanlege 和 MFA 统一 (#6989)
3 years ago
Michael Bai 3b1d199669 fix: 修复KoKo登录时，未开启SMS服务出现了SMS选项的问题
3 years ago
ibuler 2c46072db2 fix: 修复serializer问题
3 years ago
xinwen b375cd3e75 fix: otp 绑定问题
3 years ago
xinwen 1ab247ac22 fix: 用户密码过期提醒
3 years ago
fit2bot 43f30b37da
fix: 用户手机号没有校验 (#6875)
3 years ago
xinwen 7560b70c4d feat: 用户详情页面显示 手机号，钉钉，企业微信，飞书
3 years ago
xinwen f3906ff998 fix: 用户导出 can_public_key_auth 没翻译
3 years ago
xinwen d22bb2c92f fix: 重置密码连接生成多个token
3 years ago
xinwen 870dac37b9 fix: 重置密码成功的消息里有 br 标签
3 years ago
xinwen 6695d0a8a2 fix: 用户不能禁用或启用自己
3 years ago
xinwen d34c7edb00 refactor: 重构消息
3 years ago
xinwen f8f783745c fix: 修改密码没有发通知
3 years ago
xinwen 4fe715d953 fix: 首次登录不能提交
3 years ago
fit2bot 81000953e2
fix: 修改消息订阅 (#6789)
3 years ago
xinwen b1fceca8a6 feat: 添加短信服务和用户消息通知
3 years ago
fit2bot 07179a4d22
feat: 页面配置serializer版 (#6750)
3 years ago
fit2bot fca3a8fbca
perf: 绑定MFA认证密码时对密码进行加密传输 (#6776)
3 years ago
feng626 e8e211f47c feat: add app asset suggestion
3 years ago
feng626 5854ad1975 perf: 优化变量名
3 years ago
fit2bot 0f87f05b3f
feat: 工单多级审批 + 模版创建 (#6640)
3 years ago
xinwen 10c2935df4 fix: 用户创建 500
3 years ago
feng626 0e9079fa2e
Merge pull request #6673 from jumpserver/pr@dev@user_role_search
3 years ago
feng626 58c058c1a5 fix: 修复user筛选用户bug
3 years ago
Bai d46f1080f8 fix: 修复校验用户密码规则
3 years ago
xinwen 9c7adb7a14 fix: 用户列表导出部分字段没翻译
3 years ago
fit2bot 54751a715c
feat: 添加 飞书 (#6602)
3 years ago
feng626 1db0e28346 feat: 用户管理增加角色搜素
3 years ago
Bai 8ad78ffef8 fix: 修改SECURITY_PASSWORD_MIN_LENGTH
3 years ago
Bai fe2d80046c fix: 修改用户密码更新API取消Retrieve权限
3 years ago
fit2bot 67f6b1080e
feat: 管理员和普通用户支持单独设置MFA和密码长度 (#6562)
3 years ago
wojiushixiaobai 1da187c373 perf: 优化 MFA 绑定提示
3 years ago
ibuler c1ca48a32a perf: 修改i18n
3 years ago
Bai 62ba3984bd fix: 修复用户列表角色字段不显示的问题
3 years ago
fit2bot ec8dca90d6
refactor: 整合系统用户和管理用户 (#6236)
3 years ago
Bai a8d84fc6e1 feat: 修改迁移文件
4 years ago
Bai 0c7838d0e3 feat: 修改迁移文件
4 years ago
Jiangjie.Bai f26483c9cd
Merge pull request #6224 from jumpserver/feat_account_manager
4 years ago
Bai 5daca6592b feat: 修改文案 后端 -> 来源
4 years ago
fit2bot 4ef3b2630a
feat: 站内信 (#6183)
4 years ago
xinwen b82e9f860b fix: users 遗漏一个 migration
4 years ago
Michael Bai f8b4259a8c fix: 修复创建/更新用户时密码策略相关的问题
4 years ago
xinwen f9ca46dd67 fix: 修复用户历史密码在创建时不起作用
4 years ago
xinwen c16319ec48 feat: 添加企业微信，钉钉扫码登录
4 years ago
ibuler 4d6d4cbc22 perf: 优化登录，cas, openid 自动登录
4 years ago
fghbng@qq.com 72f9d0d371 serializer优化&&资产授权导入优化
4 years ago
fghbng@qq.com 9a92e24e50 serializer优化&&授权导入优化
4 years ago
fit2cloud-jiangweidong e3511df4f8
feat: 管理员可以设置用户是否下次登录需修改密码 (#6006)
4 years ago
fit2cloud-jiangweidong 11e5a97f14
feat: 用户更改密码不可使用前n次历史密码，管理员可设置历史密码重复次数 (#6010)
4 years ago
ibuler ab0fda93f6 perf: 优化公钥设置，并删掉一部分不用的 html
4 years ago
ibuler d9552c0038 perf: 优化公钥设置，让用户可以选择是否开启
4 years ago
xinwen b97759687d fix: 邀请用没有触发信号
4 years ago
xinwen f11d3c1cf2 fix: 过期用户登录提示无效
4 years ago
xinwen 7e4f20f443 refactor: 移动 PermissionsMixin 位置
4 years ago
xinwen 607b7fd29f feat: MFA 登录次数限制
4 years ago
ibuler ea325f6e52 perf(users): 优化用户认证来源
4 years ago
ibuler cc3911d2f1 fix: 修复 user profile all orgs 的bug
4 years ago
ibuler 7dfd0ee8fe fix(orgs): 修复访问 current org api 错误
4 years ago
Bai bd8a1a7d0e fix: 修复MFA绑定失败的问题(通过修改session中auth_backend的key实现;django.auth.get_user时校验backends路径失败返回AnonymousUser)
4 years ago
fit2bot 5b2649f775
fix: 修改用户序列类read_only字段 (#5729)
4 years ago
ibuler 09303ecc56 perf: 优化各serializer字段翻译
4 years ago
ibuler 81170b4b7b perf: 优化登录页面，非常给力
4 years ago
fit2bot 0aa2c2016f
perf(project): 优化命名的风格 (#5693)
4 years ago
Bai 56328e112a perf: 移除资源创建时对于Auditor用户的限制
4 years ago
fit2bot f548b4bd2b
feat: serializer 添加默认值，前端可以调用 (#5666)
4 years ago
fit2bot a56ac7b34e
perf(orgs): 默认组织改为实体组织，并支持全局组织 (#5617)
4 years ago
fit2bot 6f3ead3c42
perf: 优化系统用户生成密码的复杂度 (#5648)
4 years ago
fit2bot a7ab7da61c
feat: 添加限制用户只能从source登录的功能 (#5592)
4 years ago
xinwen 4c4f544f0d fix: 修复禁用 MFA 后还可以用 MFA 查看密码匣子
4 years ago
xinwen 8ec26dea43 feat: 重置 MFA 发个邮件 #754
4 years ago
ibuler bb9790a50f feat: 为rdp 添加一个api
4 years ago
ibuler d852d2f670 perf: 还原回原来的用户来源字段
4 years ago
ibuler dd5b2b9101 perf: 去掉 v2 的api
4 years ago
fit2bot d363118911
perf(settings): 优化settings配置 (#5515)
4 years ago
fit2bot ea16088c08
fix: 修改翻译内容 (#5489)
4 years ago
Bai f6622f5e01 fix: 修改翻译
4 years ago
fit2bot 083f061665
perf: 更新翻译 (#5438)
4 years ago
fit2bot be7a93d81a
feat: 在登录页面添加CAS/OpenID等第三方登录链接;不再自动跳转登录地址;统一开源/企业版登录页面; (#5389)
4 years ago
fit2bot a7fa2331bd
feat: 添加缓存模块，添加组织资源统计 (#5407)
4 years ago
Bai 19c2973501 perf: 可以获取多种协议类型的系统用户列表
4 years ago
ibuler e7a3c5a822 perf(api): filter_fields被filterset_fields取代
4 years ago
fit2bot cef93abb2f
feat: 抽象View Mapping Serializer架构设计; 重构工单View、Serializer模块 (#5371)
4 years ago
Jiangjie.Bai 3b056ff953
reactor&feat: 重构工单模块 & 支持申请应用工单 (#5352)
4 years ago
xinwen c3e2e536e0 fix: 【用户管理】-创建用户组-可将系统审计员加入到用户组 #579
4 years ago
xinwen 7bf37611bd fix: 系统审计员不应该能添加到组
4 years ago
Bai 8ced6f1168 fix: 用户ProfileAPI设置is_first_login不是可读写
4 years ago
fit2bot 7c7de96158
feat(login): 登录日志要体现用哪个backend登录的 #4472 (#5199)
4 years ago
Bai 4c3a655239 perf: 用户序列类禁止修改source字段
4 years ago
xinwen df2f1b3e6e perf(User): 用户列表在大规模数据情况下慢
4 years ago
xinwen 91081d9423
refactor(perms): 在动态用户所绑定的授权规则中，如授权给用户组，当用户组增加成员后，动态系统用户下没有相应增加用户，因此也不会自动推送 (#5084) (#5086)
4 years ago
fit2bot 6d39a51c36
[fix]: 兼容django 3 (#5038)
4 years ago
xinwen 6e8922da1c fix(trans): 完善翻译
4 years ago
fit2bot f04544e8df
feat(MFA): 修改文案Google Authenticator为手机验证器 (#4964)
4 years ago
xinwen b1ac3fa94f fix(orgs): 更新用户时`org_roles`参数为`None`时不更新组织角色
4 years ago
fit2bot 5868d56e18
perf: 更新密码中也发送邮件 (#4789)
4 years ago
ibuler 52f1dcf662 fix(users): 修复邀请用户的bug
4 years ago
fit2bot c73b49fe30
perf: 优化生成假数据 (#4759)
4 years ago
ibuler 93a400f6e6 feat(users): 添加用户suggetion api
4 years ago
fit2bot 96d5c519ec
perf(i18n): 添加翻译信息 (#4748)
4 years ago
Bai 3ccf32ed48 feat(authentication): 用户重置密码成功后，发送用户重置密码成功邮件
4 years ago
xinwen 6701a1b604 fix(perms): 用户添加到用户组报错
4 years ago
ibuler ddb71c43c4 fix(users): 修复用户在不同组织引起的问题
4 years ago
fit2bot 9cb5985947
fix(orgs): 创建组织用户不必填 (#4515)
4 years ago
xinwen fcd8356e90 fix(users): 组织管理员，移除组织成员报错500 #231
4 years ago
xinwen 64d093e677 fix(users): 用户接口添加`org_roles`字段
4 years ago
xinwen af85d551ad fix(users): 修改用户角色显示名称
4 years ago
xinwen 4cf5573c36 fix(users): 修复用户与用户组关系变化时没触发信号
4 years ago
xinwen f1e29a91f7 fix(users): 用户接口添加汇总角色字段
4 years ago
xinwen ec2b3b4cda fix(user): 调整`User`接口字段
4 years ago
xinwen c3c5801d2e refactor(orgs): 重构组织与用户关系接口
4 years ago
xinwen f8e248f0af feat(ticket): 调整申请资产工单
4 years ago
xinwen b331730422 fix(users): 替换旧有角色常量
4 years ago
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
ibuler dd5bf546df [Update] 修改serialzier_class
5 years ago
Bai 4bd2681bf0 [Update] Merge from dev to lina
5 years ago
Bai 98e3adbb11 [Update] Merge from master to dev
5 years ago
Bai 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
5 years ago
Bai 0cff6ab29b [Update] Merge fromo dev to lina
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