Unverified Commit cf2fbb5a authored 4 years ago by Matthias Urhahn Committed by GitHub 4 years ago

Merge pull request #2592 from corona-warn-app/dev/merge-1.15-into-2.0

Merge 1.15 into 2.0 (DEV)

parents ea4fec53 59de41bc

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt 5 additions, 6 deletions

...st/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/launcher/LauncherActivityTest.kt 6 additions, 5 deletions

.../de/rki/coronawarnapp/ui/launcher/LauncherActivityTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt 4 additions, 2 deletions

...idTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt 4 additions, 1 deletion

...ava/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentTest.kt 4 additions, 1 deletion

...onawarnapp/ui/onboarding/OnboardingTracingFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt 8 additions, 0 deletions

...dTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt 2 additions, 3 deletions

...st/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/submission/ui/SubmissionTestFragmentViewModel.kt 9 additions, 10 deletions

...app/test/submission/ui/SubmissionTestFragmentViewModel.kt
Corona-Warn-App/src/main/assets/privacy_de.html 224 additions, 123 deletions

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

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

Corona-Warn-App/src/main/assets/privacy_tr.html
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt 13 additions, 3 deletions

...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/BugCensor.kt 34 additions, 0 deletions

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

...oronawarnapp/bugreporting/censors/DiaryEncounterCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/DiaryLocationCensor.kt 11 additions, 5 deletions

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

...i/coronawarnapp/bugreporting/censors/DiaryPersonCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/DiaryVisitCensor.kt 8 additions, 3 deletions

...ki/coronawarnapp/bugreporting/censors/DiaryVisitCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/QRCodeCensor.kt 2 additions, 1 deletion

...de/rki/coronawarnapp/bugreporting/censors/QRCodeCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/censors/RegistrationTokenCensor.kt 7 additions, 4 deletions

...nawarnapp/bugreporting/censors/RegistrationTokenCensor.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/bugreporting/debuglog/ui/DebugLogFragment.kt 22 additions, 1 deletion

...oronawarnapp/bugreporting/debuglog/ui/DebugLogFragment.kt

with 789 additions and 382 deletions

Please register or to comment