Commit e05f14ae authored 3 years ago by Matthias Urhahn

Merge branch 'release/2.0.x' into release/2.1.x

# Conflicts:
#	gradle.properties

parents df4f9b54 974154b1

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/build.gradle 2 additions, 1 deletion

Corona-Warn-App/build.gradle
Corona-Warn-App/schemas/de.rki.coronawarnapp.eventregistration.storage.TraceLocationDatabase/1.json 9 additions, 3 deletions

...pp.eventregistration.storage.TraceLocationDatabase/1.json
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryDatabaseMigrationTest.kt 2 additions, 1 deletion

...contactdiary/storage/ContactDiaryDatabaseMigrationTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryDatabaseTest.kt 2 additions, 1 deletion

...awarnapp/contactdiary/storage/ContactDiaryDatabaseTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/eventregistration/storage/CheckInDatabaseData.kt 4 additions, 2 deletions

...awarnapp/eventregistration/storage/CheckInDatabaseData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt 4 additions, 4 deletions

...dTest/java/de/rki/coronawarnapp/ui/tracing/TracingData.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt 1 addition, 0 deletions

.../coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt 1 addition, 1 deletion

...ronawarnapp/test/crash.ui/SettingsCrashReportViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt 14 additions, 1 deletion

...st/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaonboardingFragment.kt 6 additions, 1 deletion

...arnapp/test/deltaonboarding/ui/DeltaonboardingFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt 2 additions, 2 deletions

...i/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt 12 additions, 12 deletions

...pp/test/presencetracing/ui/PresenceTracingTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragmentModule.kt 5 additions, 5 deletions

...t/presencetracing/ui/PresenceTracingTestFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestViewModel.kt 3 additions, 3 deletions

...p/test/presencetracing/ui/PresenceTracingTestViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt 298 additions, 0 deletions

...est/presencetracing/ui/poster/QrCodePosterTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragmentModule.kt 18 additions, 0 deletions

...esencetracing/ui/poster/QrCodePosterTestFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestViewModel.kt 138 additions, 0 deletions

...st/presencetracing/ui/poster/QrCodePosterTestViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt 1 addition, 0 deletions

...klevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt 8 additions, 8 deletions

...va/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_deltaonboarding.xml 27 additions, 0 deletions

...ceForTesters/res/layout/fragment_test_deltaonboarding.xml

with 557 additions and 45 deletions

Please register or to comment