Merge pre-release/2024-R4.2 into master#830
Merged
Merged
Conversation
* add first attempt at shelx downstream view * populate model with parseable empty value * handle there being no file * tidy up the pasta * replace dimple specifics in html * add pdb file for ulgymol view * remove cruft * add the parent info to the shelxt model * bonus fix of apstatus not handling multiple results for sm * Apply suggestion: use ' rather than escaping " in query strings Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * improve logic when file path is missing Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * just return the answer Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * replace `print` with - Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * use in_array for checking if a key is in an array Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * parentheses come in pairs * only try to plot maps if the plugin says it has maps --------- Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
…822) * Make OIDC auth type more generic * Remove mention of CAS in redirect message * Redirect to upstream provider for logout
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
… shipment is booked (#814) * LIMS-1396: Use shipping service callback URL to only send emails once shipment is booked * LIMS-1396: Update shipping status when updating dewar status --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-656: Show auto generated subsamples if they have data * LIMS-656: Simpler way to show icon * LIMS-656: Remove 'Old' column --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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: