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

https://github.com/alfio-event/alf.io/issues/1125 #1303

Open
wants to merge 218 commits into
base: 2.0-M4-maintenance
Choose a base branch
from

Conversation

sergyer
Copy link
Contributor

@sergyer sergyer commented Dec 1, 2023

Added voucher code in attendees data.

cbellone and others added 30 commits January 31, 2022 15:14
* enable accessibility for pdf ticket

* add metadata for credit-note/invoice/receipt
alfio-event#1067)

* initial work for removing log4j2 lombok annotation

* continue removal log4j2 annotation work

* continue removal log4j2 annotation work

* continue removal log4j2,slf4j annotation work

* remove utilityclass lombok annotation

* fix some errors in the build

* misc cleanup
* alfio-event#1068 remove sneakythrow

* alfio-event#1068 initial work for removing AllArgsConstructor
cbellone and others added 23 commits May 8, 2023 18:31
* Added 'Add to Google Wallet' link to email with image and dummy url to GoogleWalletApiController

* Added alt to 'Add to Google Wallet' image on the ticket email.

* Removed ConfigurationKeys for PR

* add missing license header

* add custom message HTML

* Moved 'Add to Google Wallet' button to its own section in the ticket email.

* Revert "Removed ConfigurationKeys for PR"

This reverts commit 84ec162.

* fix build on Apple Silicon

* Google Wallet implemention for Event Tickets *hopefully* completed

* Changed the image of the Google Wallet pass to event.getImageUrl()

* fix images size

* fix event logo URL, remove unused param, add missing configuration

* add missing ObjectMapper to test configuration

* update package-lock.json

* throw exception if pass generation was not successful

* !dev is not accepted by pass API

* invert eventName and description

* Fixed a bug with the POST/PUT Request when creating/updating objects in the Google Wallet API.

* Converting eventDescription from markdown to plain text on Google Wallet and Apple PassKit.

* do not display wallet link if wallet is not enabled/requested

* restore license

* add configuration UI

* fix double escaping issue

* fix typo

* update ticket email, add download link for Apple Wallet

* add new frontend version

* add new frontend version

* update frontend

* add documentation

* add image

* update email layout

* update email layout, add image padding in responsive mode

* update frontend

* fix errors after merge

* update add to google wallet badge

* update public frontend

* disable pass when ticket is released or reassigned

* update frontend version

* apply sonar suggestions

---------

Co-authored-by: Edson Yanaga <[email protected]>
* generate QR Code with case insensitive data

* add missing license header

* add failing test with UTF-8 chars

* better handling of non-ascii characters

* add more test cases

* add empty migration as marker for enabling the new feature

* do not preallocate array since we have few special conditions
* api key system components working

* api-key-system bulk

* apikey bulk file

* Disable button if not valid form

* Remove console.log
* Removed default message api key works from template

* creat component event-item already takes the even from dashboad, img resposnsive

* optimize image loading

* UI event, load events, sort, active / past

* Crate modal UI

* Add logic for date

* Validation date on export

* Improved style for event title and pending payments logic

* Remove not from ngif condition

* Remove detail button
* Added docs for Mollie

Added a simple guide how to configure Mollie for use in Alf.io as payment method.

* Added section supported payment methods
* Fix button cancel from export modal

* Added cards

* Clean

* Add ng2-charts library

* Fixed cards using cols

* Improve event detail view

* Added panel with even info and language description

* Logic pieChart

* Added ticketStatistics call and model

* Added lineChart logic and formated data user friendly

* Added pipe and logics for cards event

* Added a few menu voices

* various fixes
* begining categories

* translate api-key list, user system, organizations

* translate event dashboard
* list menu with icons

* Added pipes, progress bar and check box logic part 1

* logic progress bar

* Fixed pipe for active and expire

* translate

* fixed button's esthetic

* fixed icons from menu

* fixed some classes

* added empty component ticket category detail

* fixed svg from button

* various fixes pr

* fixed typos
@sergyer
Copy link
Contributor Author

sergyer commented Dec 1, 2023

@syjer Please review.

@syjer
Copy link
Member

syjer commented Dec 2, 2023

Hi @sergyer , thank you for the PR. Everything seems ok.

Can I ask you to change the pull request so the target branch is 2.0-M4-maintenance instead of master? We are currently trying to reconcile the two branches, so for simplicity reasons, all small changes should first go on the 2.0-M4-maintenance branches.

Thank you :)

@sergyer sergyer changed the base branch from master to 2.0-M4-maintenance December 6, 2023 09:34
@sergyer sergyer closed this Dec 6, 2023
@sergyer sergyer reopened this Dec 6, 2023
@sergyer
Copy link
Contributor Author

sergyer commented Dec 6, 2023

@syjer Sure. Done.

@syjer
Copy link
Member

syjer commented Dec 6, 2023

Hi @sergyer , I guess a cherry-pick of your commit on top of the 2.0-M4-maintenance would have been better, as currently this PR cannot be merged, as the branches have diverged too much. (You may have noticed the the impossibility to merge you PR due to the amount of changed files outside your change).

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.

6 participants