Merge pre-release/2025-R1.3 into master#913
Merged
Conversation
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…#884) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1287: Improve workflow for responsive scheduling * LIMS-1287: Dont allow 'Other' for red/yellow shipments --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…ions (#870) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* Remove touchscreen app * Remove unused dependencies * Remove local version of jquery-flot-pie * Remove aliased dependencies * Remove unused app file, dead dependencies * Remove unused vendor files * Remove unused dependencies * Remove Highcharts and Moment dependencies * Reinstate call to plotYears Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> --------- Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
* LIMS-103: Fix various bugs in Screens UI * Update api/src/Page/Shipment.php Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
LIMS-1621: Support webcam auth by @ndg63276 in #898
LIMS-1549: Disallow dispatch requests on dewars that are 'processing' by @ndg63276 in #884
LIMS-1287: Improve workflow for responsive scheduling by @ndg63276 in #889
LIMS-1064: Display dropdown or span depending on number of schema options by @ndg63276 in #870
LIMS-1589 - Remove Highcharts by @gfrn in #878
LIMS-103: Fix various bugs in Screens UI by @ndg63276 in #863
LIMS-1652: Revert underscore to 1.8.3 by @gfrn in #906