Merge 2023-R4.2 into Master #679
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-222: Apply experimental parameters to all samples * LIMS-222: Fix bug from renaming method * Use toArray instead of filter and make names better --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
* LIMS-210: Prevent double clicking to create multiple samples * Use loading state to avoid double click --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-395: Display a warning on grid scans if no spots found or incomplete PIA results * LIMS-395: Use new XRC tables --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-154: Enable display of all grid scan snapshots in full * Avoid overwriting globally scoped variable n Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
…647) * LIMS-952: Display xray centring results if running 3d xray centring * LIMS-952: Mark no results as xray centring failure * LIMS-952: Display message if no diffraction found --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-77: Link Lab Contacts to fedids * Use Promise.all rather than $.when Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
…-lims-77 Fix user data invocation tests
Merge pull request #666 from DiamondLightSource/pre-release/2023-R4.1
This reverts commit 5ec00f1.
…t/LIMS-759/show-multipin-sublocations Revert "LIMS-759: Show multipin samples and their sublocations"
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.
Merge 2023-R4.2 into master
JIRA ticket: TICKET-1021
Summary:
Merge 2023-R4.2 into master
Changes:
To test: