Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve conflicts for develop to staging #10452

Merged
merged 136 commits into from
Feb 6, 2025
Merged

Resolve conflicts for develop to staging #10452

Changes from all commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
796e5bf
Merge pull request #7540 from coronasafe/develop
gigincg Apr 4, 2024
f21d81a
Merge pull request #7576 from coronasafe/develop
gigincg Apr 8, 2024
1c541e9
Merge pull request #7591 from coronasafe/develop
gigincg Apr 12, 2024
d1741bc
Merge pull request #7627 from coronasafe/develop
gigincg Apr 16, 2024
b7f1a0b
Merge pull request #7629 from coronasafe/develop
gigincg Apr 16, 2024
21387c0
Fix Content-type header in Scribe.tsx (#7631) (#7634)
nihal467 Apr 16, 2024
efdd076
Merge pull request #7655 from coronasafe/develop
gigincg Apr 18, 2024
a91230a
Merge develop to staging v24.16.0 (#7667)
nihal467 Apr 20, 2024
db05345
Revert "Merge develop to staging v24.16.0 (#7667)" (#7669)
nihal467 Apr 20, 2024
639caaa
Merge pull request #7670 from coronasafe/develop
khavinshankar Apr 20, 2024
b1dee94
Merge pull request #7677 from coronasafe/develop
khavinshankar Apr 21, 2024
c74e61a
Merge pull request #7698 from coronasafe/develop
gigincg Apr 24, 2024
c635344
Merge pull request #7718 from coronasafe/develop
khavinshankar Apr 26, 2024
0a96ac4
Merge pull request #7747 from coronasafe/develop
gigincg May 1, 2024
be19517
Merge pull request #7784 from coronasafe/develop
gigincg May 9, 2024
d292db3
Merge pull request #7794 from coronasafe/develop
khavinshankar May 10, 2024
b4ea8f5
Merge pull request #7821 from coronasafe/develop
vigneshhari May 15, 2024
546a0de
Merge pull request #7834 from coronasafe/develop
gigincg May 16, 2024
2498faf
Merge pull request #7838 from coronasafe/develop
khavinshankar May 17, 2024
5372140
Merge pull request #7844 from coronasafe/develop
khavinshankar May 17, 2024
84a4869
Merge pull request #7848 from coronasafe/develop
khavinshankar May 17, 2024
7366dab
Merge pull request #7862 from coronasafe/develop
gigincg May 20, 2024
cc2736d
Merge pull request #7884 from coronasafe/develop
gigincg May 23, 2024
4311582
Merge pull request #7893 from coronasafe/develop
khavinshankar May 24, 2024
5853981
Merge pull request #7916 from coronasafe/develop
khavinshankar May 27, 2024
dd77079
Merge pull request #7934 from coronasafe/develop
gigincg May 29, 2024
152fb19
Merge pull request #7945 from coronasafe/develop
khavinshankar May 30, 2024
e5c7a51
Merge pull request #7955 from coronasafe/develop
khavinshankar May 31, 2024
3cf5e4a
Merge pull request #7966 from coronasafe/develop
khavinshankar Jun 3, 2024
0c36d11
Merge pull request #7980 from coronasafe/develop
gigincg Jun 6, 2024
fc32629
Merge pull request #7996 from coronasafe/develop
gigincg Jun 7, 2024
ae027a1
Merge pull request #8026 from coronasafe/develop
gigincg Jun 14, 2024
87f9d97
Merge commit '6e7679e24322056ab56339dedbb9a4afba79d9aa' into staging
sainak Jun 19, 2024
dccd114
v24.25.1 Merge branch 'develop' into staging
sainak Jun 19, 2024
408dae0
Merge pull request #8074 from coronasafe/develop
khavinshankar Jun 21, 2024
c741542
Merge pull request #8087 from coronasafe/develop
gigincg Jun 27, 2024
2fdae2c
Merge pull request #8093 from coronasafe/develop
khavinshankar Jun 28, 2024
27cab8f
Merge pull request #8111 from coronasafe/develop
khavinshankar Jul 4, 2024
9a14cfb
Merge pull request #8132 from coronasafe/develop
gigincg Jul 10, 2024
9e31ccd
Merge pull request #8136 from coronasafe/develop
khavinshankar Jul 11, 2024
77de44f
Merge pull request #8147 from coronasafe/develop
khavinshankar Jul 13, 2024
7d941ce
Merge pull request #8171 from coronasafe/develop
gigincg Jul 17, 2024
bbc7916
Merge pull request #8191 from coronasafe/develop
khavinshankar Jul 22, 2024
b4c934c
Merge pull request #8195 from coronasafe/develop
gigincg Jul 22, 2024
4a79849
Merge pull request #8204 from coronasafe/develop
gigincg Jul 23, 2024
0f8a2ff
Merge pull request #8210 from coronasafe/develop
gigincg Jul 24, 2024
25f8789
Merge pull request #8217 from coronasafe/develop
gigincg Jul 26, 2024
94c877c
Merge pull request #8238 from coronasafe/develop
khavinshankar Aug 1, 2024
b4502f7
Merge pull request #8269 from coronasafe/develop
khavinshankar Aug 8, 2024
f574d80
Merge pull request #8277 from coronasafe/develop
gigincg Aug 9, 2024
cb4af94
Merge pull request #8282 from coronasafe/develop
khavinshankar Aug 9, 2024
0b12299
Merge pull request #8292 from coronasafe/develop
khavinshankar Aug 12, 2024
11d6f49
Merge pull request #8319 from coronasafe/develop
gigincg Aug 14, 2024
d52034f
Merge pull request #8322 from coronasafe/develop
khavinshankar Aug 14, 2024
8aab3aa
Merge pull request #8332 from coronasafe/develop
gigincg Aug 16, 2024
1bb1caa
Merge pull request #8346 from coronasafe/develop
khavinshankar Aug 19, 2024
5e438e5
Merge pull request #8356 from coronasafe/develop
gigincg Aug 19, 2024
586d41e
Merge pull request #8373 from coronasafe/develop
gigincg Aug 20, 2024
05714d2
Merge pull request #8385 from coronasafe/develop
khavinshankar Aug 21, 2024
154fe43
Merge pull request #8387 from coronasafe/develop
khavinshankar Aug 22, 2024
2719156
Fixes neurological tab from crashing in older browsers (patch to `sta…
rithviknishad Aug 22, 2024
77857d5
Merge pull request #8393 from coronasafe/rithviknishad/fix/staging-pa…
khavinshankar Aug 22, 2024
7090b02
Merge pull request #8404 from coronasafe/develop
gigincg Aug 22, 2024
edd7cfe
Merge pull request #8468 from ohcnetwork/develop
gigincg Sep 4, 2024
f350bf2
Merge pull request #8494 from ohcnetwork/develop
khavinshankar Sep 5, 2024
6514fc7
Sainak/fix/pdf-worker-mime-type (#8513)
sainak Sep 9, 2024
416ce7d
Merge pull request #8518 from ohcnetwork/develop
rithviknishad Sep 11, 2024
a67c84a
Merge pull request #8551 from ohcnetwork/develop
khavinshankar Sep 17, 2024
7e07ccd
Merge pull request #8561 from ohcnetwork/develop
khavinshankar Sep 18, 2024
8c3c116
Merge pull request #8567 from ohcnetwork/develop
rithviknishad Sep 18, 2024
35981a3
Merge pull request #8569 from ohcnetwork/develop
khavinshankar Sep 19, 2024
ab967a3
Merge pull request #8573 from ohcnetwork/develop
khavinshankar Sep 19, 2024
6009869
Merge pull request #8577 from ohcnetwork/develop
khavinshankar Sep 20, 2024
1843705
Fixes file upload missing pagination component
rithviknishad Sep 23, 2024
00a67ee
Merge pull request #8594 from ohcnetwork/rithviknishad/fix/missing-pa…
khavinshankar Sep 23, 2024
d513681
Merge pull request #8617 from ohcnetwork/develop
khavinshankar Sep 25, 2024
ec84045
Merge pull request #8623 from ohcnetwork/develop
khavinshankar Sep 25, 2024
71b9399
Plausible: Track applied filters (#8641)
rithviknishad Sep 26, 2024
7eb8415
Merge pull request #8651 from ohcnetwork/develop
khavinshankar Sep 27, 2024
25d9013
Merge pull request #8652 from ohcnetwork/develop
khavinshankar Sep 27, 2024
21e28f9
Merge pull request #8655 from ohcnetwork/develop
rithviknishad Sep 27, 2024
d25ba1c
Merge pull request #8657 from ohcnetwork/develop
rithviknishad Sep 27, 2024
c3b9d81
Merge pull request #8671 from ohcnetwork/develop
rithviknishad Sep 30, 2024
0e911e2
Merge pull request #8674 from ohcnetwork/develop
rithviknishad Sep 30, 2024
25f67c9
Merge pull request #8695 from ohcnetwork/develop
khavinshankar Oct 4, 2024
1e29994
Merge pull request #8711 from ohcnetwork/develop
rithviknishad Oct 4, 2024
c631e75
Merge pull request #8749 from ohcnetwork/develop
khavinshankar Oct 9, 2024
8d1042e
Merge pull request #8767 from ohcnetwork/develop
khavinshankar Oct 11, 2024
ffff1a7
Merge pull request #8799 from ohcnetwork/develop
khavinshankar Oct 16, 2024
69364c1
Merge pull request #8835 from ohcnetwork/develop
rithviknishad Oct 20, 2024
63a28a5
disable abha number linking when health facility id is not present
khavinshankar Oct 21, 2024
420318b
Merge pull request #8850 from ohcnetwork/disable-abha-no-hf
khavinshankar Oct 21, 2024
a12b67f
Revert "disable abha number linking when health facility id is not pr…
sainak Oct 24, 2024
b6e5fa7
Merge pull request #8909 from ohcnetwork/develop
gigincg Oct 24, 2024
eb425c8
Merge pull request #8920 from ohcnetwork/develop
rithviknishad Oct 24, 2024
8137600
Merge pull request #8964 from ohcnetwork/develop
sainak Oct 30, 2024
62406b8
Merge pull request #8966 from ohcnetwork/develop
khavinshankar Oct 30, 2024
d66f870
Merge pull request #9008 from ohcnetwork/develop
rithviknishad Nov 6, 2024
acba6cc
Merge pull request #9040 from ohcnetwork/develop
rithviknishad Nov 7, 2024
1e97899
include icons used in enabled apps while treeshaking the icons
khavinshankar Nov 8, 2024
46f966a
Merge pull request #9069 from ohcnetwork/plugin-icon-treeshaking-staging
khavinshankar Nov 8, 2024
962e2a9
Fix min date for discharge (#9082)
shivankacker Nov 11, 2024
e0fcdc8
Merge pull request #9087 from ohcnetwork/develop
khavinshankar Nov 13, 2024
c3b1ba2
Merge pull request #9103 from ohcnetwork/develop
khavinshankar Nov 13, 2024
c210484
replicated the PR 9139
nihal467 Nov 18, 2024
3c7ef5c
Staging Patch | Respiratory support table/graph: render no data point…
khavinshankar Nov 18, 2024
3de98d9
Merge pull request #9162 from ohcnetwork/develop
rithviknishad Nov 20, 2024
30739f1
Merge Develop To Staging v24.48.0 | Patch (#9195)
rithviknishad Nov 25, 2024
a8985fc
Merge pull request #9213 from ohcnetwork/develop
khavinshankar Nov 26, 2024
e3584e0
Merge pull request #9227 from ohcnetwork/develop
khavinshankar Nov 28, 2024
1051450
Merge pull request #9299 from ohcnetwork/develop
khavinshankar Dec 5, 2024
732ccd6
Merge pull request #9380 from ohcnetwork/develop
rithviknishad Dec 11, 2024
376eb70
User creation form bug fix (#9406)
Jacobjeevan Dec 13, 2024
a67ab4f
fixed critical care update redirection
nihal467 Dec 16, 2024
39066a6
Merge pull request #9455 from ohcnetwork/fix-critical
khavinshankar Dec 16, 2024
095faf3
Merge pull request #9483 from ohcnetwork/develop
khavinshankar Dec 19, 2024
326c274
Merge pull request #9517 from ohcnetwork/develop
rithviknishad Dec 20, 2024
28f9c51
Merge pull request #9535 from ohcnetwork/develop
rithviknishad Dec 26, 2024
ddbe9c9
Merge pull request #9600 from ohcnetwork/develop
rithviknishad Dec 28, 2024
7abac10
Merge pull request #9608 from ohcnetwork/develop
rithviknishad Dec 30, 2024
4938126
Merge pull request #9694 from ohcnetwork/develop
gigincg Jan 3, 2025
7a08dc1
Merge pull request #9792 from ohcnetwork/develop
gigincg Jan 6, 2025
a040aae
Merge pull request #9881 from ohcnetwork/develop
gigincg Jan 10, 2025
9b9a188
Merge pull request #9893 from ohcnetwork/develop
gigincg Jan 11, 2025
09e27f5
Merge pull request #9914 from ohcnetwork/develop
gigincg Jan 12, 2025
7bdfd4d
Merge pull request #10023 from ohcnetwork/develop
gigincg Jan 17, 2025
ad89cfd
Merge branch 'develop' into staging
gigincg Jan 17, 2025
6d76efa
expose env variables to plugins via window
khavinshankar Jan 23, 2025
9eb989c
Merge pull request #10114 from ohcnetwork/core-env
sainak Jan 23, 2025
855ec28
Merge pull request #10137 from ohcnetwork/develop
rithviknishad Jan 24, 2025
100de0a
Merge pull request #10299 from ohcnetwork/develop
rithviknishad Jan 31, 2025
4ae9cae
Staging Patch: Fix setting time on datetime question causing duplicat…
rithviknishad Feb 3, 2025
525dac8
remove hardcoded date encounter notes (#10382)
rithviknishad Feb 4, 2025
787ca06
added PatientDetailsTabDemographyGeneralInfo plaggable (#10417)
khavinshankar Feb 5, 2025
1b254c4
Staging Patch: Remove appointment type section from patient details p…
rithviknishad Feb 5, 2025
e814a1b
Merge branch 'staging' into rithviknishad/fix/resolve-conflicts-devel…
rithviknishad Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.