Commit ef736890 authored 3 years ago by Matthias Urhahn

Merge branch 'release/2.3.x' into release/2.4.x

# Conflicts:
#	Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml

parents ebf90aaf ad66d04e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 0 additions, 99 deletions

.circleci/config.yml
.circleci/install-android-sdk.sh 0 additions, 29 deletions

.circleci/install-android-sdk.sh
Corona-Warn-App/proguard-rules.pro 8 additions, 1 deletion

Corona-Warn-App/proguard-rules.pro
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt 36 additions, 0 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 58 additions, 2 deletions

...ava/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/vaccination/VaccinationConsentFragmentTest.kt 67 additions, 0 deletions

...awarnapp/ui/vaccination/VaccinationConsentFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/details/VaccinationDetailsFragmentTest.kt 1 addition, 2 deletions

.../vaccination/ui/details/VaccinationDetailsFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragmentTest.kt 229 additions, 0 deletions

...arnapp/vaccination/ui/list/VaccinationListFragmentTest.kt
Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt 5 additions, 1 deletion

...droidTest/java/testhelpers/FragmentTestModuleRegistrar.kt
Corona-Warn-App/src/androidTest/java/testhelpers/ViewActions.kt 16 additions, 2 deletions

...-Warn-App/src/androidTest/java/testhelpers/ViewActions.kt
Corona-Warn-App/src/debug/res/drawable/test_qr_code.png 0 additions, 0 deletions

Corona-Warn-App/src/debug/res/drawable/test_qr_code.png
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt 2 additions, 2 deletions

...rs/java/de/rki/coronawarnapp/miscinfo/MiscInfoFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt 2 additions, 2 deletions

.../coronawarnapp/test/appconfig/ui/AppConfigTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt 2 additions, 2 deletions

...awarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/coronatest/ui/CoronaTestTestFragment.kt 2 additions, 2 deletions

...oronawarnapp/test/coronatest/ui/CoronaTestTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt 2 additions, 2 deletions

...rnapp/test/crash.ui/SettingsCrashReportDetailsFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/crash.ui/SettingsCrashReportFragment.kt 2 additions, 2 deletions

...oronawarnapp/test/crash.ui/SettingsCrashReportFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt 2 additions, 2 deletions

...awarnapp/test/datadonation/ui/DataDonationTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt 2 additions, 3 deletions

...oronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/EnvironmentState.kt 0 additions, 2 deletions

...ki/coronawarnapp/test/debugoptions/ui/EnvironmentState.kt

with 436 additions and 155 deletions

Please register or to comment