Skip to content

[bot] Merge 24.11 to develop#896

Merged
github-actions[bot] merged 751 commits intodevelopfrom
fb_bot_merge_24.11
Feb 28, 2025
Merged

[bot] Merge 24.11 to develop#896
github-actions[bot] merged 751 commits intodevelopfrom
fb_bot_merge_24.11

Conversation

@github-actions
Copy link

Generated automatically.
Merging changes from: 66135c6
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=fb_bot_merge_24.11

Adam Rauch and others added 30 commits June 8, 2018 21:51
…mporary fix in Routes.tsx but crumb navigation is broken until the change to ComponentClass is accounted for in Crumb.
…modules this evening

Revert: Add user to method signature so implementations don't have to grab it from the current ViewContext
…o lookup when lookup key is selected. Queries the lookup table to get the values. Also getPackage API now returns property descriptor lookup options by default. 2. Sorted lookup key drop down. 3. Extensible columns can now define a column title for display in extra fields in package and project UI.
…. Do not show on this page. Fix locator on SND test.
-This includes modules17.3 r.55160 in which we removed hard coded values from DomainTemplate and did related refactoring.
-This also includes merge of consolidated scripts ehr_billing-17.30-18.10 and wnprc_billing-17.30-18.10 (wnprc billing staging instance should already have tables and columns defined/updated in this merged script, so any new table or column additions in new scripts (18.10 and above) will be picked up when they upgrade. LabKey devs working on wnprc billing will have to use a new database if they are not already uptodate).
Testing feature branch on snd
labkey-teamcity and others added 25 commits August 12, 2024 01:04
… have the same SuperPkgId (#233)

* added logic for finding duplicate superPkgIds

* updated some comments

* updated comments for better understanding of code

* added check for existing eventDataId in map
…pulation for iterative updates (#243)

* added logic for separating rows containing eventNoteIds

* added isUpdate logic to getBulkSuperPkgs

* added isUpdate logic to getBulkSuperPkgs

* Merge alt key

* error handling

* added logic for separating rows containing eventNoteIds

* added isUpdate logic to getBulkSuperPkgs

* changed order of method calls

* rebased with commits for alternate key

* removed space

* removed getEventNote method

* EventNotesDataIterator

* Remove unused variable

---------

Co-authored-by: Marty Pradere <martyp@labkey.com>
* SND/Packages schema

* SubjectId, Date, SequenceNum

* EventData.objectid column

* objectid FK

* Filter on eventdata. Add qcstate.

* Categories schema

* Categories schema

* Avoid lookup joins for perf

* Bump schema versions to 25.000 (#248)

* Remove commented out code

---------

Co-authored-by: Marty Pradere <martyp@labkey.com>
Co-authored-by: Adam Rauch <adam@labkey.com>
1. Want to ensure the importRows code path is only triggered by the initial data load
2. Changed criteria to look at the number of events instead of the number of eventData or AttributeData rows
@github-actions github-actions bot merged commit 7eb9f95 into develop Feb 28, 2025
4 of 6 checks passed
@github-actions github-actions bot deleted the fb_bot_merge_24.11 branch February 28, 2025 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.