Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Remove term "Auffrischimpfung" from booster certificate (EXPOSUREAPP-9224) #4002

Merged
merged 7 commits into from
Aug 31, 2021
Merged

Remove term "Auffrischimpfung" from booster certificate (EXPOSUREAPP-9224) #4002

merged 7 commits into from
Aug 31, 2021

Commits on Aug 31, 2021

  1. Adjusted booster display logic.

    @SamuraiKek
    SamuraiKek committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    05f1dd1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/2.9.x' into feature/9224-reorganise-treatment-o… 

    …f-booster-vaccination

# Conflicts:
#	Corona-Warn-App/src/main/res/values/covid_certificate_strings.xml
    @SamuraiKek
    SamuraiKek committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    7fd7f3e View commit details
    Browse the repository at this point in the history

  3. Removed translated texts from 2.9 merge.

    @SamuraiKek
    SamuraiKek committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    6d9c4f1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release/2.9.x' into feature/9224-reorganise-treatment-o… 

    …f-booster-vaccination
    @jurajkusnier
    jurajkusnier committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    9f329af View commit details
    Browse the repository at this point in the history

  5. Priority is determined only by latest date.

    @SamuraiKek
    SamuraiKek committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    eb4a90e View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/feature/9224-reorganise-treatmen… 

    …t-of-booster-vaccination' into feature/9224-reorganise-treatment-of-booster-vaccination
    @SamuraiKek
    SamuraiKek committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    3f69bd4 View commit details
    Browse the repository at this point in the history

  7. Removed line of code by mistake.

    @SamuraiKek
    SamuraiKek committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    71fc51e View commit details
    Browse the repository at this point in the history