Merge latest main to test-rook for 11.3 #1228
Merged
Conversation
This file contains 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
3423 - Create errorToast for docReviewerService errors
3423 - Add filename to error toast
enable submitting notes with enter key add watermark for nr and duplicate pages # Conflicts: # docker-compose.yml # web/Dockerfile # web/Dockerfile.local # web/src/components/FOI/Home/Redlining.js
Dev rook nk foimod 3563
# Conflicts: # web/src/components/FOI/Home/Redlining.js
update dev-rook with latest from dev (consults)
Revert "3423 - Add filename to error toast"
Revert "3423 - Create errorToast for docReviewerService errors"
Main <> Dev Synch Nov 11 2024 (Consults / Release 11.0)
merge translucent toggle to dev
fix cfd personal not loading in prod stemming from merge issue
translucent toggle to main
Dev nk foimod 3610
new ministry codes INF, MCM, ECS
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.