Skip to content

Merge pre-release/2025-R3.5.2 into master#976

Merged
ndg63276 merged 9 commits intomasterfrom
pre-release/2025-R3.5.2
Aug 26, 2025
Merged

Merge pre-release/2025-R3.5.2 into master#976
ndg63276 merged 9 commits intomasterfrom
pre-release/2025-R3.5.2

Conversation

@ndg63276
Copy link
Collaborator

No description provided.

ndg63276 and others added 9 commits July 22, 2025 10:43
* LIMS-742: Remove redundant 'pid' check

* LIMS-742: Fix tests

* LIMS-742: Fix tests

* LIMS-742: Fix tests

* LIMS-742: Fix tests

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…cessing on grid scans (#956)

* LIMS-1780: Show dials.align_crystal results on characterizations

* LIMS-1787: Display autoprocessing on grid scans if run

* Update client/src/js/modules/dc/views/dc.js

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

* LIMS-1780: Add padding, fix cursor

* LIMS-1780: Fix cursor for XOAlign strategies

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1796: Display filepath for attachments

* LIMS-1796: Display tooltip

* LIMS-1796: Display full filepath if very short

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1550: Add 'Mark Dispensing' button to plate well view (#869)

* LIMS-1550: Add 'Mark Dispensing' button to plate well view

* LIMS-1550: Dont throw an error if no subsamples exist

* LIMS-1550: Use new BLSamplePosition table

* LIMS-1550: Label positions as 'dispensing'

* LIMS-1550: Change plus signs to crosses when the button text changes

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-167: Dont default to mx type for calendar/logistics views (#942)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1716: Multicrystal processing only shows one DC per group (#938)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1718: Display cluster info on multiplex jobs (#937)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1752: Create view for Ligand Fit pipeline (#943)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1798: Only show the latest dispensing position

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
@ndg63276 ndg63276 merged commit 1138d0c into master Aug 26, 2025
4 checks passed
@ndg63276 ndg63276 deleted the pre-release/2025-R3.5.2 branch August 26, 2025 11:33
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.

2 participants