"...tfidf-famer.git" did not exist on "68bdfb65aefb6bc10bfa0365dc63df37aaebba9f"
Merge branch 'release/1.14.x' into feature/4741-contact-journal-extension-main
# Conflicts: # Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt # Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/util/ContactDiaryExtensions.kt # Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml # Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml # Corona-Warn-App/src/main/res/values-de/strings.xml # Corona-Warn-App/src/main/res/values/contact_diary_strings.xml # Corona-Warn-App/src/main/res/values/strings.xml
No related branches found
No related tags found
Showing
- .circleci/config.yml 61 additions, 2 deletions.circleci/config.yml
- Corona-Warn-App/build.gradle 7 additions, 1 deletionCorona-Warn-App/build.gradle
- Corona-Warn-App/libs/play-services-nearby-exposurenotification-1.7.2-eap.aar 0 additions, 0 deletions...s/play-services-nearby-exposurenotification-1.7.2-eap.aar
- Corona-Warn-App/libs/play-services-nearby-exposurenotification-18.0.3.aar 0 additions, 0 deletions...libs/play-services-nearby-exposurenotification-18.0.3.aar
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/storage/tracing/TracingIntervalDaoTest.kt 2 additions, 1 deletion...i/coronawarnapp/storage/tracing/TracingIntervalDaoTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/MainActivityTest.kt 13 additions, 2 deletions...est/java/de/rki/coronawarnapp/ui/main/MainActivityTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt 6 additions, 2 deletions...ava/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt 104 additions, 0 deletions...awarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragmentTest.kt 9 additions, 7 deletions...onboarding/OnboardingDeltaInteroperabilityFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragmentTest.kt 5 additions, 19 deletions...rki/coronawarnapp/ui/onboarding/OnboardingFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingNotificationsFragmentTest.kt 5 additions, 3 deletions...napp/ui/onboarding/OnboardingNotificationsFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingPrivacyFragmentTest.kt 5 additions, 3 deletions...onawarnapp/ui/onboarding/OnboardingPrivacyFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTestFragmentTest.kt 5 additions, 3 deletions...coronawarnapp/ui/onboarding/OnboardingTestFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentTest.kt 5 additions, 3 deletions...onawarnapp/ui/onboarding/OnboardingTracingFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionConsentFragmentTest.kt 13 additions, 4 deletions...onawarnapp/ui/submission/SubmissionConsentFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionQrCodeScanFragmentTest.kt 5 additions, 3 deletions...warnapp/ui/submission/SubmissionQrCodeScanFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionSymptomCalendarFragmentTest.kt 5 additions, 3 deletions...pp/ui/submission/SubmissionSymptomCalendarFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragmentTest.kt 5 additions, 3 deletions.../coronawarnapp/ui/submission/SubmissionTanFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt 10 additions, 3 deletions...i/submission/SubmissionTestResultAvailableFragmentTest.kt
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultConsentGivenFragmentTest.kt 2 additions, 1 deletion...ubmission/SubmissionTestResultConsentGivenFragmentTest.kt
Loading
Please register or sign in to comment