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 pre-release/2024-R5.3 (and pre-release/2024-R5.2) into master #882

Merged
merged 13 commits into from
Dec 16, 2024

Conversation

ndg63276
Copy link
Collaborator

No description provided.

ndg63276 and others added 13 commits November 12, 2024 10:05
* LIMS-1463: Always display Mesh3d data collections as grid scans

* LIMS-1463: Combine if clauses

---------

Co-authored-by: Mark Williams <[email protected]>
* LIMS-1515: Add energy value to data collections

* LIMS-1515: Use a class constant

---------

Co-authored-by: Mark Williams <[email protected]>
* 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 <[email protected]>
* LIMS-1514: Allow sorting of visit list

* LIMS-1514: Remove editing artifacts

* LIMS-1514: Allow searching by beamline name

---------

Co-authored-by: Mark Williams <[email protected]>
* [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 <[email protected]>
Co-authored-by: Mark Williams <[email protected]>
* Remove old jQuery version

* Remove desktop jQuery

---------

Co-authored-by: Guilherme de Freitas <[email protected]>
* 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 <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>
@ndg63276 ndg63276 merged commit 7eb2aab into master Dec 16, 2024
4 checks passed
@ndg63276 ndg63276 deleted the pre-release/2024-R5.3 branch December 16, 2024 10:42
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.

1 participant