Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DiamondLightSource/SynchWeb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: DiamondLightSource/SynchWeb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: prerelease
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 23 files changed
  • 6 contributors

Commits on May 31, 2024

  1. LIMS-1204: Remove log area from top of active visits (#735)

    * LIMS-1204: Remove log area from the top of active visits
    
    * LIMS-1204: Remove dclog.js
    
    ---------
    
    Co-authored-by: Mark Williams <[email protected]>
    ndg63276 and Mark Williams authored May 31, 2024
    Configuration menu
    Copy the full SHA
    24c9e1d View commit details
    Browse the repository at this point in the history
  2. ULIMS-50: Shipping service incoming shipment redirect (#731)

    * LIMS-1113: Redirect to shipping-service on dispatch
    
    * LIMS-1113: Fix typos in shipping service URLs
    
    * LIMS-1113: Change text on submit button if redirecting
    
    * LIMS-1113: Fix shipment request requests for Dewars with no pucks/samples
    
    * LIMS-1113: Don't redirect for international shipments
    
    * LIMS-1113: Tweak logic for international shipments
    
    * LIMS-1113: Propagate shipping service error codes to client
    
    * LIMS-1113: Link to shipping service from shipping page
    
    * LIMS-1113: Restore commented code
    
    * LIMS-1113: Include Dewar data in dispatch error log
    
    * LIMS-1113: Apply GdF suggestions
    
    * LIMS-1113: Update config_sample.php
    
    * LIMS-1113: Limit redirects to supported countries
    
    * LIMS-1113: Add supported country dropdown to dispatch from
    
    * ULIMS-50: Redirect to shipping service to book incoming shipments
    
    * Update client/src/js/modules/shipment/views/createawb.js
    
    Co-authored-by: Guilherme Francisco <[email protected]>
    
    * Update client/src/js/modules/shipment/views/createawb.js
    
    Co-authored-by: Guilherme Francisco <[email protected]>
    
    * Update api/src/Page/Shipment.php
    
    Co-authored-by: Guilherme Francisco <[email protected]>
    
    * Update api/src/Page/Shipment.php
    
    Co-authored-by: Guilherme Francisco <[email protected]>
    
    * ULIMS-50: Add better error messages, make hidden fields not required
    
    * ULIMS-50: Update description and date validation in dispatch model
    
    * 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 <[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]>
    
    ---------
    
    Co-authored-by: Guilherme Francisco <[email protected]>
    Co-authored-by: Mark W <[email protected]>
    Co-authored-by: Mark Williams <[email protected]>
    Co-authored-by: Dominic Oram <[email protected]>
    5 people authored May 31, 2024
    Configuration menu
    Copy the full SHA
    57db914 View commit details
    Browse the repository at this point in the history
  3. LIMS-1331: Send all dispatch requests to Goods Handling unless intern…

    …ational via DHL for BI/MX (#779)
    
    Co-authored-by: Mark W <[email protected]>
    JPHall-DLS and ndg63276 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    b940fce View commit details
    Browse the repository at this point in the history
  4. LIMS-1206: Remove stacked usage bar chart from visit page (#743)

    * LIMS-1206: Remove stacked usage bar chart from visit page
    
    * Remove no longer used modules/stats/views/stack.js
    
    ---------
    
    Co-authored-by: Mark Williams <[email protected]>
    ndg63276 and Mark Williams authored May 31, 2024
    Configuration menu
    Copy the full SHA
    ad8274c View commit details
    Browse the repository at this point in the history
  5. LIMS-1203: Remove hidden temporary button to 'Use facility account' (#…

    …741)
    
    Co-authored-by: Mark Williams <[email protected]>
    ndg63276 and Mark Williams authored May 31, 2024
    Configuration menu
    Copy the full SHA
    168fa86 View commit details
    Browse the repository at this point in the history
Loading