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.

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

Merge pre-release/2024-R5.4 with master #892

Merged
merged 5 commits into from
Jan 10, 2025
Merged

Conversation

ndg63276
Copy link
Collaborator

No description provided.

ndg63276 and others added 5 commits December 16, 2024 14:29
* LIMS-1569: Use dials image viewer to get resolution & ice rings

* LIMS-1569: Use old method to get resolution & ice rings if not using dials

* LIMS-1569: Use a separate flag for getting rings from dials

* LIMS-1569: Improve invert behaviour

* LIMS-1569: Improve invert behaviour

* LIMS-1569: Improve invert behaviour

---------

Co-authored-by: Mark Williams <[email protected]>
* LIMS-1002: Fix error when creating new laboratory

* LIMS-1002: Fix test

* LIMS-1002: Fix test

---------

Co-authored-by: Mark Williams <[email protected]>
* LIMS-1302: Add session to container even if UAS says session not found

* LIMS-1302: Only log errors from UAS, not successes

* LIMS-1302: Convert tabs to spaces

---------

Co-authored-by: Mark Williams <[email protected]>
* Remove touchscreen app

* Remove redundant comment

Co-authored-by: Mark W <[email protected]>

---------

Co-authored-by: Mark W <[email protected]>
@ndg63276 ndg63276 merged commit 3684b32 into master Jan 10, 2025
4 checks passed
@ndg63276 ndg63276 deleted the pre-release/2024-R5.4 branch January 10, 2025 12:28
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