From ba7fad51eb5ec8ebfb4f02c01e519f7eca910966 Mon Sep 17 00:00:00 2001 From: Mark W <24956497+ndg63276@users.noreply.github.com> Date: Mon, 20 May 2024 12:51:09 +0100 Subject: [PATCH] Merge prerelease into master (#774) * 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 * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams * LIMS-1304: Correct the order of before and after snapshots * LIMS-1304: Update to fix typo Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * LIMS-1235: Queries for implicit samples and DCs in project time out (#758) Co-authored-by: Mark Williams * 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 * LIMS-1174: Handle blank proposal on visits page (#740) Co-authored-by: Mark Williams * LIMS-44: Speed up visit query (#759) Co-authored-by: Mark Williams * LIMS-1059: Add visit column to shipments list (#742) Co-authored-by: Mark Williams * Restore EM menu in dropdown (#766) (#767) * Merge master into prerelease (#773) * 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 * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams --------- Co-authored-by: Mark Williams * 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 * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams * LIMS-1304: Correct the order of before and after snapshots * LIMS-1304: Update to fix typo Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> * LIMS-1235: Queries for implicit samples and DCs in project time out (#758) Co-authored-by: Mark Williams * 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 * LIMS-1174: Handle blank proposal on visits page (#740) Co-authored-by: Mark Williams * LIMS-44: Speed up visit query (#759) Co-authored-by: Mark Williams * LIMS-1059: Add visit column to shipments list (#742) Co-authored-by: Mark Williams * 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 * LIMS-1256: Remove validation from Local Contact field (#756) Co-authored-by: Mark Williams * LIMS-667: Make the Requested Imager a required field if a plate is being created (#733) Co-authored-by: Mark Williams * LIMS-1261: Fix the grid scan heat maps on the VMXi container view (#744) Co-authored-by: Mark Williams * LIMS-1289: Fix sample and pdb count on protens page (#753) Co-authored-by: Mark Williams --------- Co-authored-by: Mark Williams --------- Co-authored-by: Guilherme Francisco Co-authored-by: Mark Williams --------- Co-authored-by: Mark Williams Co-authored-by: Dominic Oram Co-authored-by: Guilherme Francisco --------- Co-authored-by: Guilherme Francisco Co-authored-by: Mark Williams Co-authored-by: Dominic Oram --------- Co-authored-by: Mark Williams Co-authored-by: Dominic Oram Co-authored-by: Guilherme Francisco