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.

Sign up for GitHub

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

Jump to bottom

Dev-Marshal <> Test-Marshal Merge #5424

Merged
merged 220 commits into from
Nov 6, 2024
Merged

Dev-Marshal <> Test-Marshal Merge #5424

merged 220 commits into from
Nov 6, 2024

Conversation

JieunSon96
Copy link
Collaborator

No description provided.

sumathi.thirumani and others added 30 commits June 3, 2024 11:37
Draft commit for communications feature.
f366cee
@milosdes
Refactor correspondence comments to use MUI accordion
50df467
@milosdes
Remove unnecessary code
8cd548b
Sending emails + Export as PDF.
9ae9c23
@sumathi-thirumani
Merge pull request #5250 from bcgov/dev-marshal-ST-3968-comments
e81d6bb 
3968 - correspondence comments using MUI accordion
@milosdes
Create communicationuploadmodal component
42c3213
@milosdes
Add modal to commentstructure
839739b
Draft commit for correspondence feature.
cc0ce1a
@sumathi-thirumani
Merge pull request #5254 from bcgov/dev-marshal-ST-3968-comments
c0f9d73 
3968 - comments upload reply modal
category changes.
d7fd6d2
@sumathi-thirumani
Merge pull request #5262 from bcgov/main
6e58b2a 
Merge from main
Changes for draft commit of correspondence integration.
21fe6b5
@sumathi-thirumani
Merge pull request #5263 from bcgov/dev-marshal-ST-3968
c9008f9 
Dev marshal st 3968
Reorder scripts.
144f6aa
@sumathi-thirumani
Merge pull request #5266 from bcgov/dev-marshal-ST-3968
e531afc 
Reorder scripts.
@milosdes
Add search buttons and fix email button cursor
f150c9d
@sumathi-thirumani
Merge pull request #5267 from bcgov/dev-marshal-ST-3968-searchbuttons
da33fc7 
3968 - add search buttons
Bubble icons UI changes.
35cae2b
Edit and Delete draft functional changes.
d071444
@sumathi-thirumani
Merge pull request #5270 from bcgov/dev-marshal-ST-3968
276b88c 
Dev marshal st 3968
@milosdes
Add dropdown to add new corespondence button
7de2428
@sumathi-thirumani
Merge pull request #5271 from bcgov/dev-marshal-ST-3968-dropdownbutton
23f9d0c 
3968 - Add New correspondence dropdown button
Remove template restrictions.
80129b2
Merge remote-tracking branch 'origin/dev-marshal-ST-3968' into dev-ma…
52eb00d 
…rshal-ST-3968

# Conflicts:
#	forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx
@sumathi-thirumani
Revert "3968 - Add New correspondence dropdown button"
6180e94
@sumathi-thirumani
Merge pull request #5272 from bcgov/revert-5271-dev-marshal-ST-3968-d…
be29c15 
…ropdownbutton

Revert "3968 - Add New correspondence dropdown button"
Handle draft with attachments,
761122b
Enable "Preview & Send" as default.
6660a5e
@milosdes
Create templatelist and fix email download
e1af5fc
Response capture feature - Draft commit.
ab96531
milosdes and others added 27 commits August 23, 2024 17:01
@milosdes
Add israwrequest column to migration file
a66a856
@milosdes
Add israwrequest to correspondence model
5da1590
@milosdes
Use israwrequest to route to raw or ministry requests
b40720a
@milosdes
Add israwrequest to correspondence schema
7c95ec2
@milosdes
Sort merged correspondences and update raw and ministry separately
624549c
@milosdes
Use israwrequest to determine raw or ministry
b7f1832
@milosdes
Merge pull request #5379 from bcgov/dev-marshal-MD-2981
4a3515e 
2981 - add israwrequest to differentiate raw and ministry correspondence
@milosdes
Add download modal and adjust CommunicationStructure display
e31a920
@milosdes
Remove unused imports
9c065ec
@milosdes
Merge pull request #5392 from bcgov/dev-marshal-MD-2981
2cee90f 
2981 - Add download correspondence modal
@milosdes
Save current time when changing date of response
36157f8
@milosdes
Add draft templates to templatelist
a70c10d
@milosdes
Merge pull request #5394 from bcgov/dev-marshal-MD-2981
10b92a5 
2981 - Add draft templates to template list
@JieunSon96
remove console log
1575b17
@JieunSon96
revert the changes
06383f2
@JieunSon96
Merge pull request #5400 from bcgov/dev-marshal-ss-372
c23bac2 
Remove console log
@milosdes
Changes from UX review
d10c9bb
@milosdes
Merge pull request #5401 from bcgov/dev-marshal-MD-2981
460cf09 
2981 - changes from UX review
Merge branch 'dev' of https://github.com/bcgov/foi-flow into dev-mars…
cba9d95 
…hal-JC-FOIMOD-3176-v2
Revert "Merge branch 'dev' of https://github.com/bcgov/foi-flow into …
68ca1b9 
…dev-marshal-JC-FOIMOD-3176-v2"

This reverts commit cba9d95, reversing
changes made to 460cf09.
@Aman-Hundal
Merge pull request #5418 from bcgov/test-marshal
6fb55a6 
Test Marshal <> Dev Merge - Release 11.0 (Consults)
@Aman-Hundal
Merge pull request #5419 from bcgov/dev
42abaab 
Dev <> Main Merge - Release 11.0 (Consults)
@Aman-Hundal
Migration scrtip adjustments for release 11.0
36738ae
@Aman-Hundal
Merge pull request #5420 from bcgov/dev-AH-FOIMOd-3246
4bdc101 
Release 11.0 / Consults (Migration Script Adjustments)
@Aman-Hundal
Merge pull request #5421 from bcgov/dev
b4d5a7b 
Release 11.0 / Consults (Migration Script Adjustments)
@JieunSon96
Merge branch 'dev-marshal' into test-marshal-update-new
9481c0c
@JieunSon96
fixed revision head and conflict issue
61092ae
@sonarqubecloud SonarQubeCloud
Copy link

sonarqubecloud bot commented Nov 6, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
5.4% Duplication on New Code (required ≤ 3%)
D Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@JieunSon96 JieunSon96 merged commit fe68d02 into test-marshal Nov 6, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abin-aot abin-aot abin-aot approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@JieunSon96 @abin-aot @milosdes @sumathi-thirumani @aparna-aot @Aman-Hundal