-
Notifications
You must be signed in to change notification settings - Fork 31
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
) * 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]>
Co-authored-by: Mark Williams <[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]>
Co-authored-by: Mark W <[email protected]>
…or MX (#685) Co-authored-by: Mark Williams <[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
Co-authored-by: Mark Williams <[email protected]>
* 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]>
On Build: Satisfy Psalm Config (#689)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
To test: