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

Dev mergeconflict #413

Merged
merged 4 commits into from
Jul 27, 2023
Merged

Dev mergeconflict #413

merged 4 commits into from
Jul 27, 2023

Conversation

acoard-aot
Copy link
Contributor

No description provided.

nikhila-aot and others added 4 commits June 20, 2023 11:45
Merge dev -> Main for CSSA Form Deployment to Test
* SDS Form fixes

* SIR workflow and common email workflow

* updated with latest changes from chefs

* Fixed Conditional issue and inspected for CHEFS housing fields

* updating latest srcr form

* added srcr section

* latest chagnes for SDS form and workflow

* task-171 workflow changes

* sir form updates

* gave flow name:

* disable notes for client user

* added logic to disable form content based on user groups

* adding chagnes for cssa  sharing

* add javascript null checks

* adding names to controls in workflow

* changes for map component

* NIR worfkflow

* added notes and reviewer actions to NIR form

* NOM workflow initial draft

* bundle workflow and forms initial draft

* handled society flows

* NOM workflow and form changes

* issue fix for rejection, email integration and form changes

* Ss 109 configmap (#400)

* test imagetsream

* test

* test

* update

* test

* update confogmap issue fix

* changes for resubmit

* changed form title and notes api key

* changed workflow name

* changed notes api key and workflow process name

* inital fixes for resubmission

* fixed ap flow issues

* fixed submissions for sdm

* fixed caseworker resubmit

* changes for srcr resubmit

* changes for incorrect final status

* issue with cssa completing first

* fixed reject scenarios

* changes for bundling

* fixed alternatng resubmit issue

* corrected folder structure

---------

Co-authored-by: RyanBirtch-aot <[email protected]>
Co-authored-by: jaise-aot <[email protected]>
Co-authored-by: nikhila-aot <[email protected]>
Co-authored-by: midhun-aot <[email protected]>
Co-authored-by: midhun-aot <[email protected]>
Co-authored-by: nikhila-aot <[email protected]>
@sakthi-aot sakthi-aot self-requested a review July 27, 2023 16:31
@acoard-aot acoard-aot merged commit fdc0744 into dev Jul 27, 2023
8 checks passed
@acoard-aot acoard-aot deleted the dev-mergeconflict branch July 27, 2023 16:32
@sonarcloud
Copy link

sonarcloud bot commented Jul 27, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

jaise-aot pushed a commit that referenced this pull request Dec 29, 2023
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.

3 participants