Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #2690

Merged
merged 186 commits into from
Jun 4, 2024
Merged

Develop #2690

merged 186 commits into from
Jun 4, 2024

Conversation

nannan00
Copy link
Collaborator

@nannan00 nannan00 commented Jun 4, 2024

变更点(Changes)

  • xxxx

相关issues (Which issues this PR fixes)

  • Fixes #

备注(Special notes)

zhu327 and others added 30 commits April 7, 2024 16:48
@zhu327
feat: add super manger notification config api
c8bdd5d
@zhu327
Merge pull request #2595 from zhu327/feat_notification
f0dc28a 
feat: add super manger notification config api
@lhzzforever
feature: 提交续期通知部分代码
2ab8489
@ielgnaw
Merge pull request #2596 from lhzzforever/dev/develop_ci_renewal_notice
4506511 
Dev/develop ci renewal notice
@lhzzforever
fix: 添加漏缺的路由文件
97e8f4b
@lhzzforever
Merge branch 'ft_renewal_notice' into dev/develop_ci_renewal_notice
736fd38
@ielgnaw
Merge pull request #2597 from lhzzforever/dev/develop_ci_renewal_notice
70c2291 
fix: 添加漏缺的路由文件
@lhzzforever
Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal…
a8930f2 
…_notice
@lhzzforever
Merge branch 'dev/develop_ci_renewal_notice' of https://github.com/lh…
d0e2795 
…zzforever/bk-iam-saas into dev/develop_ci_renewal_notice
@lhzzforever
Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal…
d84fc45 
…_notice
@zhu327
fix: fix expired_at_before
e8fb308
@zhu327
Merge pull request #2598 from zhu327/feat_notification
0f8f8de 
fix: fix expired_at_before
@zhu327
fix: fix init permission_expire_remind task
958b503
@zhu327
Merge pull request #2599 from zhu327/feat_notification
141749f 
fix: fix init permission_expire_remind task
@zhu327
build: update requirements (#2601)
25b806a
@lhzzforever
feature: 完成续期通知模块需求前端开发(待联调)
f5f27a1
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice
2c1ad52
@lhzzforever
Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal…
0d7a4a6 
…_notice
@lhzzforever
feature: 添加续期通知重置功能
0c2c7d1
@zhu327
Feat notification (#2607)
c8431bb
@lhzzforever
fix: 合并develop分支代码
6e17cfa
@lhzzforever
feature: 续期通知模块全部代码
f0a247d
@lhzzforever
Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal…
b6b9871 
…_notice
@ielgnaw
Merge pull request #2602 from lhzzforever/dev/develop_ci_renewal_notice
4aff073 
Dev/develop ci renewal notice
@lhzzforever
fix: 提交漏缺的续期api文件
0cbe95d
@ielgnaw
Merge pull request #2617 from lhzzforever/dev/develop_ci_renewal_notice
eedeecb 
fix: 提交漏缺的续期api文件
@lhzzforever
fix: 整改重置按钮交互，限制通知范围过期前和过期后最大天数范围
5f2815f
@lhzzforever
fix: 重置和恢复默认增加非空校验
bba8fd9
@lhzzforever
Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal…
888c9c0 
…_notice
@lhzzforever
fix: 修改通知范围tip
c78d519
ielgnaw and others added 29 commits May 20, 2024 17:06
@ielgnaw
Merge pull request #2666 from lhzzforever/dev/develop_ci
43e612f 
feature: 退出登录重定向地址增加is_from_logout字段
@lhzzforever
feature; 审计模块增加续期通知类型业务
4b47265
@lhzzforever
fix: 去掉log
7e18c90
@ielgnaw
Merge pull request #2667 from lhzzforever/dev/develop_ci_renewal_notice
7832d4f 
feature;: 审计模块增加续期通知类型业务
@lhzzforever
fix: 邮件模板表格文字修改 (#2671)
f62e26e
@zhu327
Merge pull request #2672 from TencentBlueKing/ft_renewal_notice
c376541 
Ft renewal notice
@lhzzforever
fix: 修复管理员—>超级管理员删除后无法关闭弹窗
1f54810
@lhzzforever
fix: 优化产品侧提出的系统体验问题
a4efe05
@lhzzforever
fix: 修复申请续—>自定义权限所属系统筛选无法自定义分页
793d338
@ielgnaw
Merge pull request #2674 from lhzzforever/dev/develop_ci
38ba2cc 
fix: 修复管理员—>超级管理员删除后无法关闭弹窗
@lhzzforever
fix: 提交漏缺代码样式
0b561d7
@lhzzforever
Merge branch 'develop' into dev/develop_ci
51cb8d0
@lhzzforever
fix: 模板关联用户组页面下拉到底部后翻页按钮显示异常
56a0a33
@lhzzforever
fix: 用户组页面删除用户组后，用户组数量展示消失
95caf53
@ielgnaw
Merge pull request #2675 from lhzzforever/dev/develop_ci
cebfd4c 
fix: 模板关联用户组页面下拉到底部后翻页按钮显示异常
@lhzzforever
fix: 修复非超管身份有限制实例存在无限制的场景
7bce58e
@lhzzforever
fix: 测试只有一层拓扑且展开无数据时资源类型错误问题
4821698
@ielgnaw
Merge pull request #2678 from lhzzforever/dev/develop_ci
9445f02 
Dev/develop ci
@lhzzforever
fix: 去掉mock数据
b4b7234
@ielgnaw
Merge pull request #2679 from lhzzforever/dev/develop_ci
326a5b2 
fix: 去掉mock数据
@zhu327
fix: update email notification source (#2680)
e6eb630
@lhzzforever
feature: 变更邮件续期source值
37aa149
@lhzzforever
Merge branch 'upstream/develop' into dev/develop_ci
611ee5d
@ielgnaw
Merge pull request #2681 from lhzzforever/dev/develop_ci
26778ad 
Dev/develop ci
@lhzzforever
fix: 已关联用户组的人员模板在批量删除的时候可以成功被删除
be657fc
@lhzzforever
fix: 添加漏缺国际化
4e5f41e
@ielgnaw
Merge pull request #2684 from lhzzforever/dev/develop_ci
8e8ebd4 
fix: 已关联用户组的人员模板在批量删除的时候可以成功被删除
@nannan00
feat(open api): apply policy support custom ticket (#2685) (#2686)
7d1c102 
* feat(open api): apply policy support custom ticket (#2686 
* fix: mypy (#2688)
@nannan00
docs(version log): v1.10.28 (#2689)
6aea390
@nannan00 nannan00 merged commit 23b1d7b into master Jun 4, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nannan00 @zhu327 @lhzzforever @ielgnaw @Canway-shiisa