Skip to content

Merge prerelease into master#774

Merged
ndg63276 merged 20 commits intomasterfrom
prerelease
May 20, 2024
Merged

Merge prerelease into master#774
ndg63276 merged 20 commits intomasterfrom
prerelease

Conversation

@ndg63276
Copy link
Copy Markdown
Collaborator

Merge prerelease into master

Mark Williams and others added 20 commits April 19, 2024 16:26
…-order-of-snapshots

LIMS-1304: Correct the order of before and after snapshots
…/improve-main-menu-for-mx

LIMS-1207 - Improve main menu for mx
* LIMS-1200: CSV file upload ignores first sample

* LIMS-1200: Fix bug uploading csv with one sample

---------

Co-authored-by: Mark Williams <[email protected]>
* Restore EM menu in dropdown (#766)

* Pre release/2024 r2.2 (#770)

* LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>

* Pre release/2024 r2.3 (#772)

* LIMS-1207: Move Calendar link to top left

* LIMS-1207: Move Migrate link to Lab Contacts page

* LIMS-1207: Re-order menu, remove Assign Containers

* LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1304: Correct the order of before and after snapshots

* LIMS-1304: Update to fix typo

Co-authored-by: Mark W <[email protected]>

* LIMS-1235: Queries for implicit samples and DCs in project time out (#758)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1200: CSV file upload ignores first sample (#737)

* LIMS-1200: CSV file upload ignores first sample

* LIMS-1200: Fix bug uploading csv with one sample

---------

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1174: Handle blank proposal on visits page (#740)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-44: Speed up visit query (#759)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1059: Add visit column to shipments list (#742)

Co-authored-by: Mark Williams <[email protected]>

* Restore EM menu in dropdown (#766) (#768)

* Add 2.2a changes to 2.3 (#771)

* Restore EM menu in dropdown (#766)

* Pre release/2024 r2.2 (#770)

* LIMS-1201: Amend name of XPDF capillary crystal to use user acronym (#738)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1256: Remove validation from Local Contact field (#756)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-667: Make the Requested Imager a required field if a plate is being created (#733)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744)

Co-authored-by: Mark Williams <[email protected]>

* LIMS-1289: Fix sample and pdb count on protens page (#753)

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: Mark Williams <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Dominic Oram <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>

---------

Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Dominic Oram <[email protected]>
@ndg63276 ndg63276 merged commit ba7fad5 into master May 20, 2024
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.

3 participants