Merge pre-release/2024-R5.3 (and pre-release/2024-R5.2) into master#882
Merged
Conversation
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1463: Always display Mesh3d data collections as grid scans * LIMS-1463: Combine if clauses --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1515: Add energy value to data collections * LIMS-1515: Use a class constant --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-261: Allow download of PDB files * LIMS-261: Use RCSB for links * LIMS-261: Use EBI instead of RCSB --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1514: Allow sorting of visit list * LIMS-1514: Remove editing artifacts * LIMS-1514: Allow searching by beamline name --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* [LIMS-1552] Remove old jQuery version (#861) * Remove old jQuery version * Remove desktop jQuery * LIMS-1530: Add To Queue Fails when Not Completed filter applied --------- Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* Remove old jQuery version * Remove desktop jQuery --------- Co-authored-by: Guilherme de Freitas <guilherme.de-freitas@diamond.ac.uk>
…ar barcode (#848) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1458: Do not access attributes directly. Use set() and get() instead * LIMS-1458: Move function declaration to function body root * LIMS-1458: Do not access attributes directly. Use set() and get() instead * LIMS-1458: Unnecessary escape character * LIMS-1458: Empty block statement, Unnecessary semicolon * LIMS-1458: variable is already defined * LIMS-1458: variable is already defined * LIMS-1458: Do sorting on the server * Update client/src/js/modules/dc/views/reprocess2.js 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>
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
1 participant
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.
No description provided.