Commit bf033795 authored 3 years ago by Luka Harambasic

Merge remote-tracking branch 'origin/release/2.3.x' into release/2.4.x

# Conflicts:
#	gradle.properties

parents 7fd0a7e3 bd706fe6

No related branches found

Tags v2.4.0-RC1

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/eventregistration/organizer/QrCodeDetailFragmentTest.kt 17 additions, 1 deletion

...i/eventregistration/organizer/QrCodeDetailFragmentTest.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestViewModel.kt 8 additions, 2 deletions

...st/presencetracing/ui/poster/QrCodePosterTestViewModel.kt
Corona-Warn-App/src/main/assets/privacy_de.html 16 additions, 16 deletions

Corona-Warn-App/src/main/assets/privacy_de.html
Corona-Warn-App/src/main/assets/privacy_en.html 16 additions, 16 deletions

Corona-Warn-App/src/main/assets/privacy_en.html
Corona-Warn-App/src/main/assets/privacy_tr.html 16 additions, 16 deletions

Corona-Warn-App/src/main/assets/privacy_tr.html
Corona-Warn-App/src/main/assets/terms_de.html 1 addition, 1 deletion

Corona-Warn-App/src/main/assets/terms_de.html
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/BugCensor.kt 36 additions, 4 deletions

...va/de/rki/coronawarnapp/bugreporting/censors/BugCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/contactdiary/DiaryEncounterCensor.kt 23 additions, 18 deletions

...bugreporting/censors/contactdiary/DiaryEncounterCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/contactdiary/DiaryLocationCensor.kt 24 additions, 20 deletions

.../bugreporting/censors/contactdiary/DiaryLocationCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/contactdiary/DiaryPersonCensor.kt 25 additions, 20 deletions

...pp/bugreporting/censors/contactdiary/DiaryPersonCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/contactdiary/DiaryVisitCensor.kt 27 additions, 18 deletions

...app/bugreporting/censors/contactdiary/DiaryVisitCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/presencetracing/CheckInsCensor.kt 24 additions, 21 deletions

...pp/bugreporting/censors/presencetracing/CheckInsCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/presencetracing/TraceLocationCensor.kt 28 additions, 25 deletions

...greporting/censors/presencetracing/TraceLocationCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/submission/CoronaTestCensor.kt 33 additions, 16 deletions

...rnapp/bugreporting/censors/submission/CoronaTestCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/submission/PcrQrCodeCensor.kt 5 additions, 8 deletions

...arnapp/bugreporting/censors/submission/PcrQrCodeCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/submission/RACoronaTestCensor.kt 31 additions, 27 deletions

...app/bugreporting/censors/submission/RACoronaTestCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/submission/RatProfileCensor.kt 18 additions, 13 deletions

...rnapp/bugreporting/censors/submission/RatProfileCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/submission/RatQrCodeCensor.kt 12 additions, 10 deletions

...arnapp/bugreporting/censors/submission/RatQrCodeCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/vaccination/CertificateQrCodeCensor.kt 28 additions, 29 deletions

...greporting/censors/vaccination/CertificateQrCodeCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/DebugLogger.kt 25 additions, 3 deletions

...de/rki/coronawarnapp/bugreporting/debuglog/DebugLogger.kt

with 413 additions and 284 deletions

Please register or to comment