Merge Develop To Staging v3.1.0 #10436
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Bodhish Thomas <[email protected]>
Co-authored-by: rithviknishad <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Get error for specific inputs when updated
* 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]>
|
Conflicts have been detected against the base branch. Please merge the base branch into your branch.
|
…onflicts-develop-to-staging-2 Resolve conflicts for `develop` to `staging`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.