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: 2026-R1.5
Choose a base ref
...
head repository: DiamondLightSource/SynchWeb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2026-R2.1
Choose a head ref
  • 8 commits
  • 33 files changed
  • 3 contributors

Commits on Mar 24, 2026

  1. Merge pre-release/2026-R1.5 into master (#1055) 

    * LIMS-2104: Fix autoproc labels on mobile (#1033)

* LIMS-2064: Show no of pucks/plates on shipments page (#1038)

* LIMS-2059: Reenable reprocess button after any parameter change (#1031)

* LIMS-2054: Dont exclude peaks from MCA spectra (#1036)

* LIMS-2044: Remove luxon (#1022)

* LIMS-2031: Add toggle to expand data collection groups (#1028)

* Fix display of individual fluorescence scans and spectra

* LIMS-2023: Add Basic Auth to UAS for UDC (#1048)
    @ndg63276
    ndg63276 authored Mar 24, 2026
    Configuration menu
    Copy the full SHA
    df0e6a5 View commit details
    Browse the repository at this point in the history

  2. LIMS-2103: Display message for eBIC shipments if they try to access s… 

    …hipments (#1039)

* Display message for eBIC shipments if they try to access shipments

* Do not hide add shipments button

* Check if redirects has "em" before showing banner

* Update client/src/js/modules/shipment/views/shipments.js

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

---------

Co-authored-by: Mark W <[email protected]>
    @gfrn @ndg63276
    gfrn and ndg63276 authored Mar 24, 2026
    Configuration menu
    Copy the full SHA
    0b3b3fd View commit details
    Browse the repository at this point in the history

  3. LIMS-2077: Individual grid scans show boxes for group of grid scans (#… 

    …1041)

Co-authored-by: Mark Williams <[email protected]>
    @ndg63276
    ndg63276 and Mark Williams authored Mar 24, 2026
    Configuration menu
    Copy the full SHA
    fbe63e1 View commit details
    Browse the repository at this point in the history

  4. LIMS-2108: Add more pipelines to the summary page (#1046) 

    Co-authored-by: Mark Williams <[email protected]>
    @ndg63276
    ndg63276 and Mark Williams authored Mar 24, 2026
    Configuration menu
    Copy the full SHA
    a582fc4 View commit details
    Browse the repository at this point in the history

  5. LIMS-2129: Fix permissions for Goods Handling (#1042) 

    Co-authored-by: Mark Williams <[email protected]>
    @ndg63276
    ndg63276 and Mark Williams authored Mar 24, 2026
    Configuration menu
    Copy the full SHA
    b91a86c View commit details
    Browse the repository at this point in the history

  6. LIMS-2129: Fix permissions for Goods Handling (#1042) 

    Co-authored-by: Mark Williams <[email protected]>
    @ndg63276
    ndg63276 and Mark Williams authored Mar 24, 2026
    Configuration menu
    Copy the full SHA
    9f072d9 View commit details
    Browse the repository at this point in the history

  7. LIMS-2055: Use Compton cutoff energy from the results file (#1043) 

    * LIMS-2055: Use Compton cutoff energy from the results file

* LIMS-2055: Don't use colon as line split

* LIMS-2055: str_contains is PHP8 only

---------

Co-authored-by: Mark Williams <[email protected]>
    @ndg63276
    ndg63276 and Mark Williams authored Mar 24, 2026
    Configuration menu
    Copy the full SHA
    f996f76 View commit details
    Browse the repository at this point in the history

  8. Display message for null FedIDs (#1056) 

    * Display message for null FedIDs

* Fix tests

* Use error detection logic that works in all environments
    @gfrn
    gfrn authored Mar 24, 2026
    Configuration menu
    Copy the full SHA
    6d234f7 View commit details
    Browse the repository at this point in the history
Loading