Repository navigation
[bot] Merge 26.3 to 26.7 (Conflicts) - #1919
Merged
Merged
Conversation
Created new code that will prevent Prime users from entering their own preferred values directly onto a "Room location" drop down listings.
#1886) Created a new program that will generate TB Test Clinical Observation records from Historical Clinical Encounter entries.
#1895) Modified the function "TestBirthRecordStatus" section to include the original validation of of the birth date having set exactly the same date as the Demographic's birth date.
Added new alopecia alert to Vet notification
Added sort order to the grids. Changed the ETL time to morning 4:30Am
Fixed the query from displaying the old streaks by adding a clause to remove old streaks that later returned to 0-3 Fixed the html code by closing the <b> tag.
cnathe
force-pushed
the
26.7_fb_bot_merge_26.3
branch
from
October 5, 2026 13:08
0560439 to
91d8782
Compare
cnathe
approved these changes
Oct 5, 2026
github-actions
Bot
merged commit Oct 5, 2026
91d8782
into
release26.7-SNAPSHOT
9 of 10 checks passed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Automatic merge failed! Please merge
26.3into26.7_fb_bot_merge_26.3and resolve conflicts manually.Resolve all conflicts (using IntelliJ or
git mergetool)Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.7_fb_bot_merge_26.3