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.

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

Register an user to attend or un-attend to an event #60

Merged
merged 4 commits into from
Feb 15, 2024

Conversation

amieiro
Copy link
Collaborator

@amieiro amieiro commented Feb 13, 2024

The Attend or un-attend an event #43 PR tried to merge into the filter-style-list branch, not in the trunk branch, but we merge the PR for this filter-style-list branch before we approve the #43 PR, so the code was not merged in the trunk branch, and now it has a lot of merge conflicts.

This PR resolve the merging conflicts and add the same functionality than #43.

@amieiro amieiro requested a review from trymebytes February 13, 2024 09:19
Copy link
Member

@psrpinto psrpinto left a comment

Choose a reason for hiding this comment

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

Thanks for fixing the conflicts. I noticed a couple of things that I think need to be fixed.

includes/class-wporg-gp-translation-events-route.php Outdated Show resolved Hide resolved
includes/class-wporg-gp-translation-events-route.php Outdated Show resolved Hide resolved
@amieiro amieiro requested a review from psrpinto February 14, 2024 08:23
Copy link
Collaborator

@trymebytes trymebytes left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@amieiro amieiro merged commit 502f7e0 into trunk Feb 15, 2024
2 checks passed
@amieiro amieiro deleted the register-for-event-2 branch February 15, 2024 01:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants