diff options
author | Thomas <> | 2022-04-05 11:00:10 +0200 |
---|---|---|
committer | Thomas <> | 2022-04-05 11:00:10 +0200 |
commit | bc9eb2e62c863dae9fc9625cccb18ddfe4ff02d8 (patch) | |
tree | 7f01e64f0ede90908116f52419539d3dd9b96950 /connector/src/main | |
parent | 35bdf175478d1412ce39a7ce66f39ea26ead315c (diff) | |
parent | 9d1e1294c2825c6f9a422c9f9c51f9965258d19e (diff) | |
download | National_eIDAS_Gateway-bc9eb2e62c863dae9fc9625cccb18ddfe4ff02d8.tar.gz National_eIDAS_Gateway-bc9eb2e62c863dae9fc9625cccb18ddfe4ff02d8.tar.bz2 National_eIDAS_Gateway-bc9eb2e62c863dae9fc9625cccb18ddfe4ff02d8.zip |
Merge branch 'nightlybuild' into feature/matching_base
# Conflicts:
# connector/pom.xml
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
# modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java
# modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
# pom.xml
Diffstat (limited to 'connector/src/main')
-rw-r--r-- | connector/src/main/resources/application.properties | 2 | ||||
-rw-r--r-- | connector/src/main/resources/templates/countrySelection.html | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/connector/src/main/resources/application.properties b/connector/src/main/resources/application.properties index 0b36b103..7b624d40 100644 --- a/connector/src/main/resources/application.properties +++ b/connector/src/main/resources/application.properties @@ -126,7 +126,7 @@ eidas.ms.auth.eIDAS.szrclient.eidasbind.mds.inject=false #Raw eIDAS Id data storage eidas.ms.auth.eIDAS.szrclient.workarounds.eidmapping.revisionlog.active=true - +eidas.ms.auth.eIDAS.szrclient.workarounds.use.getidentitylink.for.ida=true eidas.ms.auth.eIDAS.szrclient.params.setPlaceOfBirthIfAvailable=true eidas.ms.auth.eIDAS.szrclient.params.setBirthNameIfAvailable=true diff --git a/connector/src/main/resources/templates/countrySelection.html b/connector/src/main/resources/templates/countrySelection.html index dfd00e18..14457210 100644 --- a/connector/src/main/resources/templates/countrySelection.html +++ b/connector/src/main/resources/templates/countrySelection.html @@ -253,11 +253,11 @@ <span th:text="#{gui.countryselection.infos.general.part.4}"> fourth part </span> </p> - <p - <span th:text="#{gui.countryselection.infos.general.part.5}"> fived part </span> - <a href="https://www.dsb.gv.at/-/das-erganzungsregister-fur-naturliche-personen-ernp-" target="_blank" - th:text="#{gui.countryselection.infos.general.link.2}"></a> - <span th:text="#{gui.countryselection.infos.general.part.6}"> sixed part </span> + <p> + <span th:text="#{gui.countryselection.infos.general.part.5}"> fived part </span> + <a href="https://www.dsb.gv.at/-/das-erganzungsregister-fur-naturliche-personen-ernp-" target="_blank" + th:text="#{gui.countryselection.infos.general.link.2}"></a> + <span th:text="#{gui.countryselection.infos.general.part.6}"> sixed part </span> </p> </div> |