Skip to content

Merge #155

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
Merged
merged 10 commits into from
Jul 31, 2023
Merged

Merge #155

merged 10 commits into from
Jul 31, 2023

Conversation

mikufan76
Copy link
Contributor

@mikufan76 mikufan76 commented Jul 28, 2023 •
edited
Loading

  • Adds in merge
  • Updates toast messages for reusability
  • Fix file name issue

@mikufan76 mikufan76 linked an issue Jul 28, 2023 that may be closed by this pull request
Merging #63
Closed
5 tasks
jwj7297
jwj7297 suggested changes Jul 28, 2023
View reviewed changes
Copy link
Contributor

@jwj7297 jwj7297 left a comment

Choose a reason for hiding this comment

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

  • I believe needs rebase as the modals only working once issue is occurring again
  • The X and click off needs to call the close method on modal as they currently don't work
    image

@mikufan76
Copy link
Contributor Author

@jwj7297 rebased

jwj7297
jwj7297 approved these changes Jul 31, 2023
View reviewed changes
Copy link
Contributor

@jwj7297 jwj7297 left a comment

Choose a reason for hiding this comment

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

Good work :)

@jwj7297 jwj7297 merged commit a4a3aba into dev Jul 31, 2023
@jwj7297 jwj7297 deleted the dev-merge branch July 31, 2023 19:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwj7297 jwj7297 jwj7297 approved these changes

@Marrufof Marrufof Awaiting requested review from Marrufof

@maxstein16 maxstein16 Awaiting requested review from maxstein16

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merging
2 participants
@mikufan76 @jwj7297