Mainline dedicated hardware kiosk changes - 2nd Edition#176
Merged
Conversation
5 tasks
pc-coholic
force-pushed
the
combined-kiosk2
branch
from
9d6424f to
f0280e3
Compare
Member
Author
|
Tested in-office with kt0345 turnstile and confirmed working. |
Superseeds #160 # Conflicts: # pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/MainActivity.kt # pretixscan/app/src/main/res/values-de/strings.xml # pretixscan/app/src/main/res/values/strings.xml # pretixscan/libpretixsync-repo
…h if ktIO is not installed
Contributor
|
pretix/libpretixsync#54 was merged after this PR, enabled with 5431dcb |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This superseeds #160 in an attempt to make the rebase easier.
ToDo:
isTR51()is correct before merge.Also merge:
After merge: