Skip to content

Merge pre-release/2025-R3.1 into master#946

Merged
ndg63276 merged 6 commits intomasterfrom
pre-release/2025-R3.1
Jun 10, 2025
Merged

Merge pre-release/2025-R3.1 into master#946
ndg63276 merged 6 commits intomasterfrom
pre-release/2025-R3.1

Conversation

@ndg63276
Copy link
Collaborator

No description provided.

ndg63276 and others added 6 commits May 27, 2025 10:33
* LIMS-1447: Dont allow shipping of red samples

* LIMS-1447: Move logic to JS and update GUI on model change

* LIMS-1447: Block direct access to URL

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1664: Improvements to registered dewar and container pages

* LIMS-1664: Fix counts now where clause has changed

* LIMS-1664: Fix bug on first page of dewars/containers

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* Make LDAP searches more configurable

* Include ldap_id_field in globals
… not full (#924)

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 aec73d2 into master Jun 10, 2025
4 checks passed
@ndg63276 ndg63276 deleted the pre-release/2025-R3.1 branch June 10, 2025 10:05
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