Skip to content

Merge pre-release/2026-R1.5 into master#1055

Merged
ndg63276 merged 10 commits intomasterfrom
pre-release/2026-R1.5
Mar 24, 2026
Merged

Merge pre-release/2026-R1.5 into master#1055
ndg63276 merged 10 commits intomasterfrom
pre-release/2026-R1.5

Conversation

@ndg63276
Copy link
Copy Markdown
Collaborator

No description provided.

gfrn and others added 10 commits March 3, 2026 10:48
* Fix autoproc labels on mobile

* Fix Rmeas label
* LIMS-2064: Show no of pucks/plates on shipments page

* Update php-jwt as much as possible and ignore security advisory

---------

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>
* LIMS-2044: Update luxon

* LIMS-2044: Remove Luxon

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-2031: Add toggle to expand data collection groups

* LIMS-2031: Move toggle to show even if no visit

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
@ndg63276 ndg63276 merged commit df0e6a5 into master Mar 24, 2026
4 checks passed
@ndg63276 ndg63276 deleted the pre-release/2026-R1.5 branch March 24, 2026 10:11
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.

3 participants