Merge pre-release/2025-R1.2 into master#904
Merged
Conversation
…#887) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…852) * LIMS-1490: Use callback URL for incoming dewars via shipping service * Update api/src/Controllers/AuthenticationController.php Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * 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>
* 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 --------- Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
* LIMS-1536: Add more options to reprocessing * LIMS-1537: Fix colour on successful submission --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…ervice (#891) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
RichB-DLS
pushed a commit
that referenced
this pull request
Feb 11, 2025
* LIMS-1590: Dont allow name editing for lab contacts when login is set (#887) * LIMS-1558: Add functionality for SMILES code for any sample (#880) * LIMS-1490: Use callback URL for incoming dewars via shipping service (#852) * LIMS-1570: Remove unused app file (#874) * LIMS-1537: Add more options to reprocessing (#876) * LIMS-1466: Disable dispatch form validation when using the shipping service (#891)
ndg63276
added a commit
that referenced
this pull request
Apr 22, 2025
* LIMS-1612 - add util fn for generating md5. * test/LIMS-1612 - Setup Basic param tests. * feat/LIMS-1612 - implement the new md5 util across all uses of uniqId * fix/LIMS-1612 - Fix PSALM faiure * Merge pre-release/2025-R1.2 into master (#904) * LIMS-1590: Dont allow name editing for lab contacts when login is set (#887) * LIMS-1558: Add functionality for SMILES code for any sample (#880) * LIMS-1490: Use callback URL for incoming dewars via shipping service (#852) * LIMS-1570: Remove unused app file (#874) * LIMS-1537: Add more options to reprocessing (#876) * LIMS-1466: Disable dispatch form validation when using the shipping service (#891) * fix/LIMS-1612 compatibility with LIMS-1490 --------- Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
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.
No description provided.