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

Introduce subscriptions #987

Merged
merged 153 commits into from
Mar 7, 2021

Conversation

cbellone
Copy link
Member

@cbellone cbellone commented Mar 7, 2021

this Pull Request replaces #981 and solves the conflicts with the development being done in the main branch

# Conflicts:
#	gradle.properties
#	src/main/java/alfio/controller/api/admin/AdminReservationApiController.java
#	src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java
#	src/main/java/alfio/manager/AdminReservationManager.java
#	src/main/java/alfio/manager/BillingDocumentManager.java
#	src/main/java/alfio/manager/EuVatChecker.java
#	src/main/java/alfio/manager/TicketReservationManager.java
#	src/main/java/alfio/repository/BillingDocumentRepository.java
#	src/main/resources/alfio/templates/invoice.ms
#	src/main/webapp/resources/js/admin/feature/reservation-cancel/reservation-cancel.js
#	src/main/webapp/resources/js/admin/feature/reservation/view/reservation-view.js
#	src/main/webapp/resources/js/admin/feature/tickets-remove/tickets-remove.js
#	src/main/webapp/resources/js/admin/service/service.js
#	src/test/java/alfio/controller/api/v2/user/reservation/BaseReservationFlowTest.java
#	src/test/java/alfio/manager/EventManagerIntegrationTest.java
@cbellone cbellone requested a review from syjer March 7, 2021 17:37
@syjer syjer mentioned this pull request Mar 7, 2021
6 tasks
@cbellone cbellone merged commit 1c17ffa into alfio-event:master Mar 7, 2021
@cbellone cbellone added this to the 2.0-M4 milestone Aug 17, 2021
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.

None yet

2 participants