Resolve conflicts for `develop` to `staging`#10451

Merged

rithviknishad merged 136 commits intodevelopfrom rithviknishad/fix/resolve-conflicts-develop-to-staging

Feb 6, 2025

+1-1

Commits on Apr 4, 2024

Merge pull request #7540 from coronasafe/develop
gigincg
authored

Commits on Apr 8, 2024

Merge pull request #7576 from coronasafe/develop
gigincg
authored

Commits on Apr 12, 2024

Merge pull request #7591 from coronasafe/develop
gigincg
authored

Commits on Apr 18, 2024

Merge pull request #7655 from coronasafe/develop
gigincg
authored

Commits on Apr 21, 2024

Merge pull request #7677 from coronasafe/develop
khavinshankar
authored

Commits on Apr 24, 2024

Merge pull request #7698 from coronasafe/develop
gigincg
authored

Commits on Apr 26, 2024

Merge pull request #7718 from coronasafe/develop
khavinshankar
authored

Commits on May 1, 2024

Merge pull request #7747 from coronasafe/develop
gigincg
authored

Commits on May 9, 2024

Merge pull request #7784 from coronasafe/develop
gigincg
authored

Commits on May 10, 2024

Merge pull request #7794 from coronasafe/develop
khavinshankar
authored

Commits on May 15, 2024

Merge pull request #7821 from coronasafe/develop
vigneshhari
authored

Commits on May 16, 2024

Merge pull request #7834 from coronasafe/develop
gigincg
authored

Commits on May 20, 2024

Merge pull request #7862 from coronasafe/develop
gigincg
authored

Commits on May 23, 2024

Merge pull request #7884 from coronasafe/develop
gigincg
authored

Commits on May 24, 2024

Merge pull request #7893 from coronasafe/develop
khavinshankar
authored

Commits on May 27, 2024

Merge pull request #7916 from coronasafe/develop
khavinshankar
authored

Commits on May 29, 2024

Merge pull request #7934 from coronasafe/develop
gigincg
authored

Commits on May 30, 2024

Merge pull request #7945 from coronasafe/develop
khavinshankar
authored

Commits on May 31, 2024

Merge pull request #7955 from coronasafe/develop
khavinshankar
authored

Commits on Jun 3, 2024

Merge pull request #7966 from coronasafe/develop
khavinshankar
authored

Commits on Jun 6, 2024

Merge pull request #7980 from coronasafe/develop
gigincg
authored

Commits on Jun 7, 2024

Merge pull request #7996 from coronasafe/develop
gigincg
authored

Commits on Jun 14, 2024

Merge pull request #8026 from coronasafe/develop
gigincg
authored

Commits on Jun 19, 2024

Commits on Jun 21, 2024

Merge pull request #8074 from coronasafe/develop
khavinshankar
authored

Commits on Jun 27, 2024

Merge pull request #8087 from coronasafe/develop
gigincg
authored

Commits on Jun 28, 2024

Merge pull request #8093 from coronasafe/develop
khavinshankar
authored

Commits on Jul 4, 2024

Merge pull request #8111 from coronasafe/develop
khavinshankar
authored

Commits on Jul 10, 2024

Merge pull request #8132 from coronasafe/develop
gigincg
authored

Commits on Jul 11, 2024

Merge pull request #8136 from coronasafe/develop
khavinshankar
authored

Commits on Jul 13, 2024

Merge pull request #8147 from coronasafe/develop
khavinshankar
authored

Commits on Jul 17, 2024

Merge pull request #8171 from coronasafe/develop
gigincg
authored

Commits on Jul 22, 2024

Commits on Jul 23, 2024

Merge pull request #8204 from coronasafe/develop
gigincg
authored

Commits on Jul 24, 2024

Merge pull request #8210 from coronasafe/develop
gigincg
authored

Commits on Jul 26, 2024

Merge pull request #8217 from coronasafe/develop
gigincg
authored

Commits on Aug 1, 2024

Merge pull request #8238 from coronasafe/develop
khavinshankar
authored

Commits on Aug 8, 2024

Merge pull request #8269 from coronasafe/develop
khavinshankar
authored

Commits on Aug 9, 2024

Commits on Aug 12, 2024

Merge pull request #8292 from coronasafe/develop
khavinshankar
authored

Commits on Aug 14, 2024

Commits on Aug 16, 2024

Merge pull request #8332 from coronasafe/develop
gigincg
authored

Commits on Aug 19, 2024

Commits on Aug 20, 2024

Merge pull request #8373 from coronasafe/develop
gigincg
authored

Commits on Aug 21, 2024

Merge pull request #8385 from coronasafe/develop
khavinshankar
authored

Commits on Sep 4, 2024

Merge pull request #8468 from ohcnetwork/develop
gigincg
authored

Commits on Sep 5, 2024

Merge pull request #8494 from ohcnetwork/develop
khavinshankar
authored

Commits on Sep 9, 2024

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

Commits on Sep 11, 2024

Merge pull request #8518 from ohcnetwork/develop
rithviknishad
authored

Commits on Sep 17, 2024

Merge pull request #8551 from ohcnetwork/develop
khavinshankar
authored

Commits on Sep 18, 2024

Commits on Sep 19, 2024

Commits on Sep 20, 2024

Merge pull request #8577 from ohcnetwork/develop
khavinshankar
authored

Commits on Sep 23, 2024

Commits on Sep 25, 2024

Commits on Sep 26, 2024

Plausible: Track applied filters (#8641 )
rithviknishad
authored

Commits on Sep 30, 2024

Commits on Oct 4, 2024

Commits on Oct 9, 2024

Merge pull request #8749 from ohcnetwork/develop
khavinshankar
authored

Commits on Oct 11, 2024

Merge pull request #8767 from ohcnetwork/develop
khavinshankar
authored

Commits on Oct 16, 2024

Merge pull request #8799 from ohcnetwork/develop
khavinshankar
authored

Commits on Oct 20, 2024

Merge pull request #8835 from ohcnetwork/develop
rithviknishad
authored

Commits on Oct 21, 2024

Commits on Oct 24, 2024

Commits on Oct 30, 2024

Commits on Nov 6, 2024

Merge pull request #9008 from ohcnetwork/develop
rithviknishad
authored

Commits on Nov 7, 2024

Merge pull request #9040 from ohcnetwork/develop
rithviknishad
authored

Commits on Nov 8, 2024

Commits on Nov 11, 2024

Fix min date for discharge (#9082 )
shivankacker
authored

Commits on Nov 13, 2024

Commits on Nov 18, 2024

Commits on Nov 20, 2024

Merge pull request #9162 from ohcnetwork/develop
rithviknishad
authored

Commits on Nov 25, 2024

Merge Develop To Staging v24.48.0 | Patch (#9195 )
rithviknishad
authored

Commits on Nov 26, 2024

Merge pull request #9213 from ohcnetwork/develop
khavinshankar
authored

Commits on Nov 28, 2024

Merge pull request #9227 from ohcnetwork/develop
khavinshankar
authored

Commits on Dec 5, 2024

Merge pull request #9299 from ohcnetwork/develop
khavinshankar
authored

Commits on Dec 11, 2024

Merge pull request #9380 from ohcnetwork/develop
rithviknishad
authored

Commits on Dec 13, 2024

User creation form bug fix (#9406 )
Jacobjeevan
authored

Commits on Dec 16, 2024

Commits on Dec 19, 2024

Merge pull request #9483 from ohcnetwork/develop
khavinshankar
authored

Commits on Dec 20, 2024

Merge pull request #9517 from ohcnetwork/develop
rithviknishad
authored

Commits on Dec 26, 2024

Merge pull request #9535 from ohcnetwork/develop
rithviknishad
authored

Commits on Dec 28, 2024

Merge pull request #9600 from ohcnetwork/develop
rithviknishad
authored

Commits on Dec 30, 2024

Merge pull request #9608 from ohcnetwork/develop
rithviknishad
authored

Commits on Jan 3, 2025

Merge pull request #9694 from ohcnetwork/develop
gigincg
authored

Commits on Jan 6, 2025

Merge pull request #9792 from ohcnetwork/develop
gigincg
authored

Commits on Jan 10, 2025

Merge pull request #9881 from ohcnetwork/develop
gigincg
authored

Commits on Jan 11, 2025

Merge pull request #9893 from ohcnetwork/develop
gigincg
authored

Commits on Jan 12, 2025

Merge pull request #9914 from ohcnetwork/develop
gigincg
authored

Commits on Jan 17, 2025

Commits on Jan 23, 2025

Commits on Jan 24, 2025

Merge pull request #10137 from ohcnetwork/develop
rithviknishad
authored

Commits on Jan 31, 2025

Merge pull request #10299 from ohcnetwork/develop
rithviknishad
authored

Commits on Feb 3, 2025

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

Commits on Feb 4, 2025

remove hardcoded date encounter notes (#10382 )
rithviknishad
authored

Commits on Feb 5, 2025

Commits on Feb 6, 2025

Merge remote-tracking branch 'upstream/staging' into rithviknishad/fix/resolve-conflicts-develop-to-staging
rithviknishad
committed