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 2023-R5.1 into Master #696

Merged
merged 14 commits into from
Nov 23, 2023
Merged

Merge 2023-R5.1 into Master #696

merged 14 commits into from
Nov 23, 2023

Conversation

NKatti2011
Copy link
Collaborator

NOTE: (PR title should be of the form ticket:short description, e.g. TICKET-123: Add more templates)

JIRA ticket: TICKET-123

Summary:

A brief description of what this pull request aims to achieve

Changes:

  • List changes made in this pull request

To test:

  • List actions that should be taken to test that functionality works as expected

ndg63276 and others added 14 commits October 12, 2023 14:00
)

* LIMS-59: Never write null to DewarTransportHistory.storageLocation

* LIMS-59: Write a location to DTH when marking a dewar as unprocessing

* LIMS-59: Check for nulls before doing inserts

* LIMS-59: Ensure tests pass

* Update test

* tidy

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: John Holt <[email protected]>
* LIMS-95: Show max score for each drop in a plate

* Update UI to use radio buttons

* Update label

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: John Holt <[email protected]>
* LIMS-140: Fix pia_estimated_d_min display on VMXi grid scans

* LIMS-140: Clear up inverting of data

* Apply suggestions from code review

Co-authored-by: Guilherme Francisco <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>
* LIMS-1074: Allow access to compressed processing logs etc

* LIMS-1074: Remove debug message

* LIMS-1074: Fix map/model viewer

* LIMS-1074: Fix downstream processing

* LIMS-1074: Remove debug message

* LIMS-1074: Remove debug message

* LIMS-1074: Use readgzfile instead of gzopen/gzread/gzclose

* LIMS-1074: Download file zipped if already zipped

* LIMS-1074: Fix download filenames

* LIMS-1074: Use readgzfile to replace readfile, and gzdecode the contents of files to manipulate

* LIMS-1074: Use readgzfile to replace readfile, and gzdecode the contents of files to manipulate

* LIMS-1074: Tidy up setting content disposition

* LIMS-1074: Deploy suggestions from code review

---------

Co-authored-by: Mark Williams <[email protected]>
…scovery-endpoint-fix

LIMS-1068: Move discovery away from constructor, get cookie expiry dynamically
Merge pull request #687 from DiamondLightSource/pre-release/2023-R4.3
* Move globals in OIDC and tidy, remove static ref in Download, conform to php7 in processing

* implement strpos properly

---------

Co-authored-by: John Holt <[email protected]>
@NKatti2011 NKatti2011 merged commit cd780d6 into master Nov 23, 2023
4 checks passed
@NKatti2011 NKatti2011 deleted the pre-release/2023-R5.1 branch January 23, 2024 16:36
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.

4 participants