Merge branch 'main' into lmendoza/9597-restore-report-work-type-to-wo…

…rk-type-menu-v2
ORCID · Jan 29, 2025 · 60fc635 · 60fc635
2 parents d50a0cd + 76f4fb6
commit 60fc635
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## v2.110.6 - 2025-01-29
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.110.5...v2.110.6)
+
+- [#2458](https://github.com/ORCID/orcid-angular/pull/2458): 9607-qa-zooming-and-scaling-must-not-be-disabled
+
+## v2.110.5 - 2025-01-29
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.110.4...v2.110.5)
+
+- [#2457](https://github.com/ORCID/orcid-angular/pull/2457): 9591-empty-record-message-heading
+
+## v2.110.4 - 2025-01-28
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.110.3...v2.110.4)
+
+- [#2456](https://github.com/ORCID/orcid-angular/pull/2456): revert-UpdateGoogleKeys
+
 ## v2.110.3 - 2025-01-28
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.110.2...v2.110.3)

diff --git a/src/app/record/components/record-info/record-info.component.html b/src/app/record/components/record-info/record-info.component.html
@@ -94,7 +94,7 @@
       "
     >
       <h2 class="orc-font-body-large" i18n="@@record.noPublicInformation">
-        There's not displayable data for this record
+        There's no displayable data for this record
       </h2>
       <p>
         <ng-container i18n="@@topBar.recordOwnerNotHaveAdded">

diff --git a/src/environments/environment.qa.ts b/src/environments/environment.qa.ts
@@ -9,7 +9,7 @@ export const environment = {
   INFO_SITE: 'https://info.qa.orcid.org/',
   GOOGLE_ANALYTICS_TESTING_MODE: true,
   GOOGLE_TAG_MANAGER: 'GTM-TRLHLRZ',
-  GOOGLE_RECAPTCHA: '6LfWgrYqAAAAAHDYK0JwyHdN7_YZtG6s7Mr3L8r2',
+  GOOGLE_RECAPTCHA: '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI',
   ZENDESK: 'b8313acd-6439-4894-b431-8c5a2ae9e7cb',
   HELP_HERO_ID: 'oYFQMrzFHA',
   SHOW_TEST_WARNING_BANNER: true,

diff --git a/src/environments/environment.sandbox.ts b/src/environments/environment.sandbox.ts
@@ -9,7 +9,7 @@ export const environment = {
   INFO_SITE: 'https://info.qa.orcid.org/',
   GOOGLE_ANALYTICS_TESTING_MODE: false,
   GOOGLE_TAG_MANAGER: 'GTM-M9Z7DHS',
-  GOOGLE_RECAPTCHA: '6LfHobYqAAAAAGeg4J4gOor0SUzIeAHPeIyBeMNK',
+  GOOGLE_RECAPTCHA: '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI',
   HELP_HERO_ID: 'oYFQMrzFHA',
   ZENDESK: null,
   SHOW_TEST_WARNING_BANNER: true,

diff --git a/src/index.html b/src/index.html
@@ -6,10 +6,7 @@
     <base href="/" />
     <meta name="robots" content="[ROBOTS_PARAMETERS]" />
 
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
-    />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <link rel="icon" type="image/x-icon" href="./assets/icons/favicon.ico" />
     <!-- NEW_RELIC_PLACEHOLDER -->

diff --git a/src/locale/properties/record/record.en.properties b/src/locale/properties/record/record.en.properties
@@ -42,7 +42,7 @@ record.showAllSources=Show all sources for
 record.hideAllSources=Hide all sources for
 record.validatedSource=Validated source
 record.selfAssertedSource=Self-asserted source
-record.noPublicInformation=There's not displayable data for this record
+record.noPublicInformation=There's no displayable data for this record
 record.noPersonalInformation=No personal information available
 record.nameIsPrivate=Name is private
 record.registerForAnOrcid=Register for an ORCID record