erge branch 'lmendoza/104-the-homepage-top-bar-new-info-has-a-bottom-…

…margin-that-needs-reducing-to-32px-2' of github.com:ORCID/orcid-angular into lmendoza/104-the-homepage-top-bar-new-info-has-a-bottom-margin-that-needs-reducing-to-32px-2
ORCID · Jul 8, 2024 · 8276625 · 8276625
2 parents 6876c23 + d7aedf3
commit 8276625
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v2.101.6 - 2024-07-08
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.101.5...v2.101.6)
+
+## v2.101.5 - 2024-07-08
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.101.4...v2.101.5)
+
 ## v2.101.4 - 2024-07-04
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.101.3...v2.101.4)

diff --git a/pull_and_clean_properties.sh b/pull_and_clean_properties.sh
@@ -40,8 +40,7 @@ git checkout transifex
 git pull
 
 echo "Merging transifex branch with main branch..."
-git checkout main
-git merge transifex
+git merge main
 
 # Perform tx pull operations for specified languages
 tx_operations "tr_TR" "tr"

diff --git a/src/environments/environment.int.ts b/src/environments/environment.int.ts
@@ -16,8 +16,8 @@ export const environment = {
   CAN_DISABLE_TEST_WARNING_BANNER: true,
   INSTITUTIONAL_AUTOCOMPLETE_DISPLAY_AMOUNT: 20,
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
-  WORDPRESS_S3: 'https://d25yxmpntoa26z.cloudfront.net',
-  WORDPRESS_S3_FALLBACK: 'https://d1kh89kum7j2ji.cloudfront.net',
+  WORDPRESS_S3: 'https://homepage-prod.orcid.org',
+  WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',

diff --git a/src/environments/environment.local-with-proxy.ts b/src/environments/environment.local-with-proxy.ts
@@ -16,8 +16,8 @@ export const environment = {
   CAN_DISABLE_TEST_WARNING_BANNER: true,
   INSTITUTIONAL_AUTOCOMPLETE_DISPLAY_AMOUNT: 50,
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
-  WORDPRESS_S3: 'https://d3055hwma3riwo.cloudfront.net',
-  WORDPRESS_S3_FALLBACK: 'https://d1kh89kum7j2ji.cloudfront.net',
+  WORDPRESS_S3: 'https://homepage-qa.orcid.org',
+  WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',

diff --git a/src/environments/environment.local.tomcat.ts b/src/environments/environment.local.tomcat.ts
@@ -14,8 +14,8 @@ export const environment = {
   SHOW_TEST_WARNING_BANNER: true,
   INSTITUTIONAL_AUTOCOMPLETE_DISPLAY_AMOUNT: 20,
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
-  WORDPRESS_S3: 'https://d3055hwma3riwo.cloudfront.net',
-  WORDPRESS_S3_FALLBACK: 'https://d1kh89kum7j2ji.cloudfront.net',
+  WORDPRESS_S3: 'https://homepage-qa.orcid.org',
+  WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',

diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts
@@ -16,8 +16,8 @@ export const environment = {
   CAN_DISABLE_TEST_WARNING_BANNER: true,
   INSTITUTIONAL_AUTOCOMPLETE_DISPLAY_AMOUNT: 50,
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
-  WORDPRESS_S3: 'https://d3055hwma3riwo.cloudfront.net',
-  WORDPRESS_S3_FALLBACK: 'https://d1kh89kum7j2ji.cloudfront.net',
+  WORDPRESS_S3: 'https://homepage-qa.orcid.org',
+  WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',

diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
@@ -15,8 +15,8 @@ export const environment = {
   HELP_HERO_ID: 'oYFQMrzFHA',
   INSTITUTIONAL_AUTOCOMPLETE_DISPLAY_AMOUNT: 20,
   VERBOSE_SNACKBAR_ERRORS_REPORTS: false,
-  WORDPRESS_S3: 'https://d25yxmpntoa26z.cloudfront.net',
-  WORDPRESS_S3_FALLBACK: 'https://d1kh89kum7j2ji.cloudfront.net',
+  WORDPRESS_S3: 'https://homepage-prod.orcid.org',
+  WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',

diff --git a/src/environments/environment.qa.ts b/src/environments/environment.qa.ts
@@ -16,8 +16,8 @@ export const environment = {
   CAN_DISABLE_TEST_WARNING_BANNER: true,
   INSTITUTIONAL_AUTOCOMPLETE_DISPLAY_AMOUNT: 20,
   VERBOSE_SNACKBAR_ERRORS_REPORTS: true,
-  WORDPRESS_S3: 'https://d3055hwma3riwo.cloudfront.net',
-  WORDPRESS_S3_FALLBACK: 'https://d1kh89kum7j2ji.cloudfront.net',
+  WORDPRESS_S3: 'https://homepage-qa.orcid.org',
+  WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',

diff --git a/src/environments/environment.sandbox.ts b/src/environments/environment.sandbox.ts
@@ -16,8 +16,8 @@ export const environment = {
   CAN_DISABLE_TEST_WARNING_BANNER: false,
   INSTITUTIONAL_AUTOCOMPLETE_DISPLAY_AMOUNT: 20,
   VERBOSE_SNACKBAR_ERRORS_REPORTS: false,
-  WORDPRESS_S3: 'https://d25yxmpntoa26z.cloudfront.net',
-  WORDPRESS_S3_FALLBACK: 'https://d1kh89kum7j2ji.cloudfront.net',
+  WORDPRESS_S3: 'https://homepage-prod.orcid.org',
+  WORDPRESS_S3_FALLBACK: 'https://homepage-fallback.orcid.org',
   LANGUAGE_MENU_OPTIONS: {
     ar: 'العربية',
     cs: 'Čeština',