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

Rebase release-2.7.patch1 on top of release-2.7 #11094

Merged
merged 14 commits into from
May 22, 2024
Merged

Rebase release-2.7.patch1 on top of release-2.7 #11094

merged 14 commits into from
May 22, 2024

Conversation

rak-phillip
Copy link
Member

Summary

This rebases release-2.7.patch1 on top of release-2.7 to ensure that the release-2.7.patch1 branch contains all of the recent changes that were included in the v2.7.13 release of Dashboard 1

Checklist

  • The PR is linked to an issue and the linked issue has a Milestone, or no issue is needed
  • The PR has a Milestone
  • The PR template has been filled out
  • The PR has been self reviewed
  • The PR has a reviewer assigned
  • The PR has automated tests or clear instructions for manual tests and the linked issue has appropriate QA labels, or tests are not needed
  • The PR has reviewed with UX and tested in light and dark mode, or there are no UX changes

Footnotes

  1. https://github.com/rancher/dashboard/releases/tag/v2.7.13 ↩

torchiaf and others added 14 commits May 9, 2024 10:47
@torchiaf @WuJun2016
show harvester cluster in fleet page (rancher#9652) (rancher#10951)
d14964b 
Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
Co-authored-by: wujun <897415845@qq.com>
@rak-phillip
Add Last Login to users table
a5fbfba 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Add User Disabled In & Deleted In columns
b6ee475 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Add translation strings for new user fields
ac2b12d 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Sort by raw value instead of string value
97412e8 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Add new fields to user details getter
2702fd1 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Customize suffix for userLastLogin
487c5ab 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Resolve issues with failing e2e tests
9a6af4c 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Update user Deleted/Disabled labels
2906841 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Stop displaying relative time when date has lapsed
c20a747 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Update user state display labels
dc55855 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Don't display a value for Disable After for disabled users
b4ca523 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Add a suffix to Last Login
554cadb 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip
Update e2e tests to reflect state label changes
ae31667 
Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
@rak-phillip rak-phillip added this to the v2.7.patch1 milestone May 22, 2024
@rak-phillip rak-phillip merged commit e79f950 into rancher:release-2.7.patch1 May 22, 2024
6 checks passed
@rak-phillip rak-phillip deleted the chore/rebase/release-2.7.patch1 branch May 22, 2024 18:34
@rak-phillip rak-phillip mentioned this pull request Jun 17, 2024
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mantis-toboggan-md mantis-toboggan-md mantis-toboggan-md approved these changes

Assignees

@rak-phillip rak-phillip

Labels
None yet
Projects
None yet
Milestone
v2.7.14
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@rak-phillip @mantis-toboggan-md @torchiaf