Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge latest dev to dev-rook #5410

Merged
merged 165 commits into from
Oct 17, 2024
Merged

merge latest dev to dev-rook #5410

merged 165 commits into from
Oct 17, 2024

Conversation

nkan-aot2
Copy link
Collaborator

No description provided.

nkan-aot2 and others added 30 commits May 13, 2024 09:23
PR to test-rook for CFD Personal Tags
merge redaction summary fix to main
FOIMOD-3285 - Page Count on Closed Request Changing to 0
…Debugging + button / manual lock feautre + ministry user work
Ticket 3232: Log Error if PDF contains embedded files or attachments
…IMOD-2880

Undo "Revert "Ticket 2880 - Lock Records""
aparna-aot and others added 28 commits August 30, 2024 15:45
FOIMOD-2982-Comments Tab - Type of Comments (Peer Review, Internal, General)-Feature merge
FOIMOD-2982- Empty check added- Loading issue fix
FOIMOD-2982-Removed commented code to rebuild web to reflect the config change for REACT_APP_DOCREVIEWER_WEB_URL value in configmap
FOIMOD-2982-Comments Tab - Type of Comments (Peer Review, Internal, General)
…eneral)-Applicant correspondence fix

Applicant correspondence fix
FOIMOD-2982-Comments Tab - Type of Comments (Peer Review, Internal, General)-Applicant correspondence fix
FOIMOD-2982-Comments Tab - Type of Comments (Peer Review, Internal, General)- Fix for applicant correspondences
new CFD Generals ministry team (CAF)
FOIMOD-3073: Fees - Remaining Balance Check
# Conflicts:
#	docker-compose.yml
#	forms-flow-web/src/actions/FOI/foiActionConstants.js
#	forms-flow-web/src/actions/FOI/foiRequestActions.js
#	forms-flow-web/src/apiManager/services/FOI/foiRecordServices.js
#	forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js
#	forms-flow-web/src/components/FOI/customComponents/Records/index.js
#	forms-flow-web/src/modules/FOI/foiRequestsReducer.js
@nkan-aot2 nkan-aot2 merged commit fcffa2a into dev-rook Oct 17, 2024
Copy link

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants