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

Ft renewal notice #2659

Merged
merged 114 commits into from
May 13, 2024
Merged

Ft renewal notice #2659

merged 114 commits into from
May 13, 2024

Commits on Apr 7, 2024

  1. feat: add super manger notification config api

    @zhu327
    zhu327 committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    c8bdd5d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2595 from zhu327/feat_notification 

    feat: add super manger notification config api
    @zhu327
    zhu327 authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    f0dc28a View commit details
    Browse the repository at this point in the history

  3. feature: 提交续期通知部分代码

    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    2ab8489 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2596 from lhzzforever/dev/develop_ci_renewal_notice 

    Dev/develop ci renewal notice
    @ielgnaw
    ielgnaw authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    4506511 View commit details
    Browse the repository at this point in the history

  5. fix: 添加漏缺的路由文件

    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    97e8f4b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ft_renewal_notice' into dev/develop_ci_renewal_notice

    @lhzzforever
    lhzzforever authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    736fd38 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2597 from lhzzforever/dev/develop_ci_renewal_notice 

    fix: 添加漏缺的路由文件
    @ielgnaw
    ielgnaw authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    70c2291 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    a8930f2 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev/develop_ci_renewal_notice' of https://github.com/lh… 

    …zzforever/bk-iam-saas into dev/develop_ci_renewal_notice
    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    d0e2795 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    d84fc45 View commit details
    Browse the repository at this point in the history

  11. fix: fix expired_at_before

    @zhu327
    zhu327 committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    e8fb308 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #2598 from zhu327/feat_notification 

    fix: fix expired_at_before
    @zhu327
    zhu327 authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    0f8f8de View commit details
    Browse the repository at this point in the history

  13. fix: fix init permission_expire_remind task

    @zhu327
    zhu327 committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    958b503 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #2599 from zhu327/feat_notification 

    fix: fix init permission_expire_remind task
    @zhu327
    zhu327 authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    141749f View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. build: update requirements (#2601)

    @zhu327
    zhu327 authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    25b806a View commit details
    Browse the repository at this point in the history

  2. feature: 完成续期通知模块需求前端开发(待联调)

    @lhzzforever
    lhzzforever committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    f5f27a1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

    @lhzzforever
    lhzzforever committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    2c1ad52 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    0d7a4a6 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. feature: 添加续期通知重置功能

    @lhzzforever
    lhzzforever committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    0c2c7d1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Feat notification (#2607)

    @zhu327
    zhu327 authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    c8431bb View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. fix: 合并develop分支代码

    @lhzzforever
    lhzzforever committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    6e17cfa View commit details
    Browse the repository at this point in the history

  2. feature: 续期通知模块全部代码

    @lhzzforever
    lhzzforever committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    f0a247d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    b6b9871 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Merge pull request #2602 from lhzzforever/dev/develop_ci_renewal_notice 

    Dev/develop ci renewal notice
    @ielgnaw
    ielgnaw authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    4aff073 View commit details
    Browse the repository at this point in the history

  2. fix: 提交漏缺的续期api文件

    @lhzzforever
    lhzzforever committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    0cbe95d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2617 from lhzzforever/dev/develop_ci_renewal_notice 

    fix: 提交漏缺的续期api文件
    @ielgnaw
    ielgnaw authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    eedeecb View commit details
    Browse the repository at this point in the history

  4. fix: 整改重置按钮交互，限制通知范围过期前和过期后最大天数范围

    @lhzzforever
    lhzzforever committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    5f2815f View commit details
    Browse the repository at this point in the history

  5. fix: 重置和恢复默认增加非空校验

    @lhzzforever
    lhzzforever committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    bba8fd9 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    888c9c0 View commit details
    Browse the repository at this point in the history

  7. fix: 修改通知范围tip

    @lhzzforever
    lhzzforever committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    c78d519 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2619 from lhzzforever/dev/develop_ci_renewal_notice 

    Dev/develop ci renewal notice
    @ielgnaw
    ielgnaw authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    1959dee View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

    @lhzzforever
    lhzzforever committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    70c90ec View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. fix: 去掉恢复默认值功能

    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    73fd12b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    027a3cd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2624 from lhzzforever/dev/develop_ci_renewal_notice 

    Dev/develop ci renewal notice
    @ielgnaw
    ielgnaw authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    2059a4f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/develop' into ft_renewal_notice

    @zhu327
    zhu327 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    a931501 View commit details
    Browse the repository at this point in the history

  5. feat: update periodic task config

    @zhu327
    zhu327 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    dca760f View commit details
    Browse the repository at this point in the history

  6. feature: 续期邮件通知模板增加过期成员、管理空间、资源实例等数据展示

    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    0f8ac5d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    f45a42c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2626 from lhzzforever/dev/develop_ci_renewal_notice 

    feature: 续期邮件通知模板增加过期成员、管理空间、资源实例等数据展示
    @ielgnaw
    ielgnaw authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    370e95f View commit details
    Browse the repository at this point in the history

  9. feature: 增加最大15天，最小7天的时间限制

    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    770e1f9 View commit details
    Browse the repository at this point in the history

  10. fix: update role notice config permission

    @zhu327
    zhu327 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    ddfb31a View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'upstream/ft_renewal_notice' into ft_ren… 

    …ewal_notice
    @zhu327
    zhu327 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    a17b5c5 View commit details
    Browse the repository at this point in the history

  12. fix: update role notice config permission

    @zhu327
    zhu327 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    5d05cd9 View commit details
    Browse the repository at this point in the history

  13. fix: 优化不同导航栏下同名路由刷新时候切换其他管理身份会刷新不在授权范围内的接口

    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    efeda24 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    e429641 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #2627 from lhzzforever/dev/develop_ci_renewal_notice 

    feature:  续期通知范围增加最大15天，最小7天的时间限制
    @ielgnaw
    ielgnaw authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    048efbd View commit details
    Browse the repository at this point in the history

  16. fix: update expire remind expired_at_before range

    @zhu327
    zhu327 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    36075fc View commit details
    Browse the repository at this point in the history

  17. fix: update role renew group list

    @zhu327
    zhu327 committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    8cc1b7d View commit details
    Browse the repository at this point in the history

  18. fix: 修改用户续期通知模板班样式

    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    8fa8266 View commit details
    Browse the repository at this point in the history

  19. fix: 修复首次加载刷新页面后续期成员勾选总数量计算错误

    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    1e01c32 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    ad29e08 View commit details
    Browse the repository at this point in the history

  21. fix: 优化数字输入框为空时，点击自增按钮会出现负数

    @lhzzforever
    lhzzforever committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    d2b9649 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #2629 from lhzzforever/dev/develop_ci_renewal_notice 

    Dev/develop ci renewal notice
    @ielgnaw
    ielgnaw authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    111b302 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. feat: add bk_apigateway management api white list

    @zhu327
    zhu327 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    757751b View commit details
    Browse the repository at this point in the history

  2. feat(role): add role config update permission and audit data

    @zhu327
    zhu327 committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    4c68cb7 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. feature: 续期通知增加关闭邮件通知功能

    @lhzzforever
    lhzzforever committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    82abfba View commit details
    Browse the repository at this point in the history

  2. fix: 同步更新续期通知状态

    @lhzzforever
    lhzzforever committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    7bbbff2 View commit details
    Browse the repository at this point in the history

  3. fix: 默认状态为false

    @lhzzforever
    lhzzforever committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    d777dec View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2630 from lhzzforever/dev/develop_ci_renewal_notice 

    feature: 续期通知增加关闭邮件通知功能
    @ielgnaw
    ielgnaw authored Apr 19, 2024
    Configuration menu
    Copy the full SHA
    aa9327d View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. fix: 修复全屏下空状态位置规范

    @lhzzforever
    lhzzforever committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    5259dd4 View commit details
    Browse the repository at this point in the history

  2. feat: add rtx notification

    @zhu327
    zhu327 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    907abda View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/ft_renewal_notice' into ft_ren… 

    …ewal_notice
    @zhu327
    zhu327 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    6653a45 View commit details
    Browse the repository at this point in the history

  4. fix: sentry sdk

    @zhu327
    zhu327 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    2764fd1 View commit details
    Browse the repository at this point in the history

  5. fix: fix rtx notification

    @zhu327
    zhu327 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    6142714 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    1747996 View commit details
    Browse the repository at this point in the history

  7. fix: 用户组成员续期处理无用户组织数据有人员模板数据情况下，自动定位到人员模板选项

    @lhzzforever
    lhzzforever committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    f09767d View commit details
    Browse the repository at this point in the history

  8. fix: 修复偶现切换staff角色的菜单会出现无权限访问

    @lhzzforever
    lhzzforever committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    b0dae3e View commit details
    Browse the repository at this point in the history

  9. fix: fix rtx notification

    @zhu327
    zhu327 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    2ec9b35 View commit details
    Browse the repository at this point in the history

  10. fix: 在mouted钩子添加销毁事件

    @lhzzforever
    lhzzforever committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    1b4d702 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #2632 from lhzzforever/dev/develop_ci_renewal_notice 

    fix: 修复全屏下空状态位置规范
    @ielgnaw
    ielgnaw authored Apr 22, 2024
    Configuration menu
    Copy the full SHA
    06da449 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. fix: 提交漏缺代码

    @lhzzforever
    lhzzforever committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    87d30a8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    11709d1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2633 from lhzzforever/dev/develop_ci_renewal_notice 

    fix: 提交漏缺代码
    @ielgnaw
    ielgnaw authored Apr 23, 2024
    Configuration menu
    Copy the full SHA
    a728f9b View commit details
    Browse the repository at this point in the history

  4. fix: fix celery beat

    @zhu327
    zhu327 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    e093d42 View commit details
    Browse the repository at this point in the history

  5. fix: add need_run_expired_remind function

    @zhu327
    zhu327 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    68df6d5 View commit details
    Browse the repository at this point in the history

  6. fix: fix celery expired remind

    @zhu327
    zhu327 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    a4ae048 View commit details
    Browse the repository at this point in the history

  7. fix: fix expired remind celery task

    @zhu327
    zhu327 committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    0a76a78 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. fix: 修复用户组添加权限无法显示面包屑标题

    @lhzzforever
    lhzzforever committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    98e6bc0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    c221b69 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. fix: fix celery app import

    @zhu327
    zhu327 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    36b16cd View commit details
    Browse the repository at this point in the history

  2. fix: update remind info role type display

    @zhu327
    zhu327 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    26967f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    f0ca418 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

    @lhzzforever
    lhzzforever committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    5616bf5 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. feature: 用户 —>同步记录同步中的状态增加删除同步记录功能

    @lhzzforever
    lhzzforever committed May 6, 2024
    Configuration menu
    Copy the full SHA
    e8828f9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2635 from lhzzforever/dev/develop_ci_renewal_notice 

    fix: 修复用户组添加权限无法显示面包屑标题
    @ielgnaw
    ielgnaw authored May 6, 2024
    Configuration menu
    Copy the full SHA
    deb6b7a View commit details
    Browse the repository at this point in the history

  3. feature: 升级人员选择器npm包版本

    @lhzzforever
    lhzzforever committed May 6, 2024
    Configuration menu
    Copy the full SHA
    b053659 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed May 6, 2024
    Configuration menu
    Copy the full SHA
    eb674a8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2641 from lhzzforever/dev/develop_ci_renewal_notice 

    Dev/develop ci renewal notice
    @ielgnaw
    ielgnaw authored May 6, 2024
    Configuration menu
    Copy the full SHA
    2ef1c61 View commit details
    Browse the repository at this point in the history

  6. feature: 新建邮件通知模板、企业微信通知模板侧边栏

    @lhzzforever
    lhzzforever committed May 6, 2024
    Configuration menu
    Copy the full SHA
    79b3129 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. fix: 处理刷新后从storage获取设置定时器状态

    @lhzzforever
    lhzzforever committed May 7, 2024
    Configuration menu
    Copy the full SHA
    18e29ee View commit details
    Browse the repository at this point in the history

  2. feature: 企业微信、邮件通知方式下的通知模板需求

    @lhzzforever
    lhzzforever committed May 7, 2024
    Configuration menu
    Copy the full SHA
    9b015f2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed May 7, 2024
    Configuration menu
    Copy the full SHA
    2c7a4c7 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. feature: 添加邮件类型的通知模板

    @lhzzforever
    lhzzforever committed May 8, 2024
    Configuration menu
    Copy the full SHA
    0afbed7 View commit details
    Browse the repository at this point in the history

  2. fix: 处理小屏幕下文字层级

    @lhzzforever
    lhzzforever committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6693614 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. fix: 统一通知模板不同通知方式的设计交互

    @lhzzforever
    lhzzforever committed May 9, 2024
    Configuration menu
    Copy the full SHA
    278e1b9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

    @lhzzforever
    lhzzforever committed May 9, 2024
    Configuration menu
    Copy the full SHA
    68f288a View commit details
    Browse the repository at this point in the history

  3. fix: 处理type为空的情况

    @lhzzforever
    lhzzforever committed May 9, 2024
    Configuration menu
    Copy the full SHA
    c6fe124 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

    @lhzzforever
    lhzzforever committed May 9, 2024
    Configuration menu
    Copy the full SHA
    c00002b View commit details
    Browse the repository at this point in the history

  5. feature: 处理通知模板rules和event校验

    @lhzzforever
    lhzzforever committed May 9, 2024
    Configuration menu
    Copy the full SHA
    cfb5a38 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. fix: util文件统一参数说明

    @lhzzforever
    lhzzforever committed May 10, 2024
    Configuration menu
    Copy the full SHA
    271c0ef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream/develop' into dev/develop_ci_renewal_notice

    @lhzzforever
    lhzzforever committed May 10, 2024
    Configuration menu
    Copy the full SHA
    87827bb View commit details
    Browse the repository at this point in the history

  3. fearetue； 设置popover-confirm关闭的默认高度为0

    @lhzzforever
    lhzzforever committed May 10, 2024
    Configuration menu
    Copy the full SHA
    788a44a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2643 from lhzzforever/dev/develop_ci_renewal_notice 

    feature: 企业微信、邮件通知方式下的通知模板需求
    @ielgnaw
    ielgnaw authored May 10, 2024
    Configuration menu
    Copy the full SHA
    e2bb546 View commit details
    Browse the repository at this point in the history

  5. feature: 注释通知模板入口

    @lhzzforever
    lhzzforever committed May 10, 2024
    Configuration menu
    Copy the full SHA
    f46980d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed May 10, 2024
    Configuration menu
    Copy the full SHA
    08013ac View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. fix: 处理保存会有loading闪一下问题

    @lhzzforever
    lhzzforever committed May 11, 2024
    Configuration menu
    Copy the full SHA
    df84706 View commit details
    Browse the repository at this point in the history

  2. fix: 去掉样式

    @lhzzforever
    lhzzforever committed May 11, 2024
    Configuration menu
    Copy the full SHA
    824e445 View commit details
    Browse the repository at this point in the history

  3. feat: update role/user rtx notification

    @zhu327
    zhu327 committed May 11, 2024
    Configuration menu
    Copy the full SHA
    cb17142 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'upstream/ft_renewal_notice' into dev/develop_ci_renewal… 

    …_notice
    @lhzzforever
    lhzzforever committed May 11, 2024
    Configuration menu
    Copy the full SHA
    98e6b71 View commit details
    Browse the repository at this point in the history

  5. feature: 合并develop分支代码

    @lhzzforever
    lhzzforever committed May 11, 2024
    Configuration menu
    Copy the full SHA
    2f9c399 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2651 from lhzzforever/dev/develop_ci_renewal_notice 

    feature: 注释通知模板入口
    @ielgnaw
    ielgnaw authored May 11, 2024
    Configuration menu
    Copy the full SHA
    2363bab View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. fix: update user rtx nitifaction template

    @zhu327
    zhu327 committed May 13, 2024
    Configuration menu
    Copy the full SHA
    f9d4cea View commit details
    Browse the repository at this point in the history

  2. docs: v1.10.28

    @zhu327
    zhu327 committed May 13, 2024
    Configuration menu
    Copy the full SHA
    44fde25 View commit details
    Browse the repository at this point in the history