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

Add a button to swap main and other user in user merge view #1789

Merged
merged 3 commits into from
Aug 24, 2022
Merged

Add a button to swap main and other user in user merge view #1789

merged 3 commits into from
Aug 24, 2022

Conversation

postmartem
Copy link
Collaborator

Closes #1781

@postmartem @niklasmohrin
Remove whitespace
9ab6e90 
Co-authored-by: Niklas Mohrin <dev@niklasmohrin.de>
@niklasmohrin niklasmohrin requested a review from janno42 August 8, 2022 16:38
richardebeling
richardebeling approved these changes Aug 8, 2022
View reviewed changes
Copy link
Member

@richardebeling richardebeling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks! :)

@postmartem @janno42
Update evap/staff/templates/staff_user_merge.html
e8a7189 
Co-authored-by: Johannes Wolf <janno42@posteo.de>
@niklasmohrin niklasmohrin requested a review from janno42 August 15, 2022 16:17
@janno42
Copy link
Member

janno42 commented Aug 24, 2022

✔️ Meets requirements
✔️ UI functionality checked

@janno42 janno42 merged commit a2b8208 into e-valuation:main Aug 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@niklasmohrin niklasmohrin niklasmohrin approved these changes

@richardebeling richardebeling richardebeling approved these changes

@janno42 janno42 janno42 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Swapping users in user profile merge preview
4 participants
@postmartem @janno42 @richardebeling @niklasmohrin