Skip to content

Commit

Permalink
Resolve conflicts for develop to staging (#10451)
Browse files Browse the repository at this point in the history
* Fix Content-type header in Scribe.tsx (#7631) (#7634)

Co-authored-by: Ashesh <[email protected]>

* Merge develop to staging v24.16.0 (#7667)

* flaky test (#7657)

* Fix round type display and qr field (#7666)

* Revert "Merge develop to staging v24.16.0 (#7667)" (#7669)

This reverts commit a91230a.

* Fixes neurological tab from crashing in older browsers (patch to `staging`)

* Sainak/fix/pdf-worker-mime-type (#8513)

* Fixes file upload missing pagination component

* Plausible: Track applied filters (#8641)

* disable abha number linking when health facility id is not present

* Revert "disable abha number linking when health facility id is not present"

This reverts commit 63a28a5.

* include icons used in enabled apps while treeshaking the icons

* Fix min date for discharge (#9082)

* replicated the PR 9139

* User creation form bug fix (#9406)

* fixed critical care update redirection

* expose env variables to plugins via window

* Staging Patch: Fix setting time on datetime question causing duplicates (#10370)

* remove hardcoded date encounter notes (#10382)

* added PatientDetailsTabDemographyGeneralInfo plaggable (#10417)

* Staging Patch: Remove appointment type section from patient details page (#10432)

---------

Co-authored-by: Gigin George <[email protected]>
Co-authored-by: Mohammed Nihal <[email protected]>
Co-authored-by: Ashesh <[email protected]>
Co-authored-by: Khavin Shankar <[email protected]>
Co-authored-by: Vignesh Hari <[email protected]>
Co-authored-by: Aakash Singh <[email protected]>
Co-authored-by: Shivank Kacker <[email protected]>
Co-authored-by: Jacob John Jeevan <[email protected]>
  • Loading branch information
9 people authored Feb 6, 2025
1 parent 87f70f4 commit e2307d0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ declare global {
}
}

// Set API URL from environment variable
// Expose Environment variable to window object for use in plugins
window.CARE_API_URL = import.meta.env.REACT_CARE_API_URL;
window.__CORE_ENV__ = careConfig;

Expand Down

0 comments on commit e2307d0

Please sign in to comment.