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

Pre Release 2023-R5.2 merge into Master #716

Merged
merged 25 commits into from
Jan 23, 2024
Merged

Conversation

NKatti2011
Copy link
Collaborator

No description provided.

stuartcampbell and others added 25 commits October 3, 2022 15:37
…_active

Make psalm passing part of the build

Only changes build proces
* LIMS-1025: Fix lab contact search

* put search code in a function

* remove debug info

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: John Holt <[email protected]>
* LIMS-898: Put callouts and elog entries into correct classes

* LIMS-898: Use config vars for elog URLs

* Hide blank columns from callouts

* LIMS-898: Add config vars for sample config

---------

Co-authored-by: Mark Williams <[email protected]>
…ds (#686)

* LIMS-768: Modify the values saved in database for Simple Sample Uploads

* LIMS-768: Use phase explicitly

---------

Co-authored-by: Mark Williams <[email protected]>
…/unrecognised-message

[LIMS-1120] Display message when user is not in database
Add support for Microsoft Active Directory in LDAP authentication
…edirect-on-shipping-auth-failure

LIMS-1125: Prompt user login on shipping service 401 status
@NKatti2011 NKatti2011 merged commit 2aec48a into master Jan 23, 2024
6 checks passed
@NKatti2011 NKatti2011 deleted the pre-release/2023-R5.2 branch January 23, 2024 16:35
NKatti2011 added a commit that referenced this pull request Jan 23, 2024
Merge pull request #716 from DiamondLightSource/pre-release/2023-R5.2
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.

6 participants