Merge branch 'develop' into issue/10158/patient-user-card-fix

rajku-dev · Feb 3, 2025 · 6a751ce · 6a751ce
2 parents 2f15f7d + 8ee64da
commit 6a751ce
Show file tree

Hide file tree

Showing 33 changed files with 137 additions and 2,146 deletions.
diff --git a/.example.env b/.example.env
@@ -47,9 +47,6 @@ REACT_SENTRY_DSN=
 # Sentry environment (default: staging)
 REACT_SENTRY_ENVIRONMENT=
 
-# Sample format file paths
-REACT_SAMPLE_FORMAT_ASSET_IMPORT=/asset-import-template.xlsx
-
 # Camera feed, still watching idle timeout (in seconds; default: 180)
 REACT_STILL_WATCHING_IDLE_TIMEOUT=
 

diff --git a/.github/workflows/label-merge-conflict.yml b/.github/workflows/label-merge-conflict.yml
@@ -24,6 +24,6 @@ jobs:
           wait_ms: 15000
           detect_merge_changes: false
           conflict_comment: |
-            Conflicts have been detected against the base branch. Please rebase your branch against the base branch.
+            Conflicts have been detected against the base branch. Please merge the base branch into your branch.
             cc: @${author}
             > _See: https://docs.ohc.network/docs/contributing#how-to-resolve-merge-conflicts_
diff --git a/care.config.ts b/care.config.ts
@@ -64,11 +64,6 @@ const careConfig = {
   reCaptchaSiteKey:
     env.REACT_RECAPTCHA_SITE_KEY || "6LdvxuQUAAAAADDWVflgBqyHGfq-xmvNJaToM0pN",
 
-  sampleFormats: {
-    assetImport:
-      env.REACT_SAMPLE_FORMAT_ASSET_IMPORT || "/asset-import-template.xlsx",
-  },
-
   wartimeShifting: boolean("REACT_WARTIME_SHIFTING"),
 
   stillWatching: {