resolving conflicts for dev to main merge #478
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
merging dev to main for deployment
Dev to main pull request for 10Aug 2023 release
merging for Sds deployment on 11 Aug 2023
* revert nir format changes * nir bundle changes * email id issue fix * issue fix for 294 * site owner actions displayed on resubmit * issue fix for 296 * issue fix for 295 * workflow updates for nir bundle * changes to NIR bundle form * add formsflow-client-reviewer check before display notes section * Updated root config CI/CD (EPDDS-270) (#454) * Updated root config CI/CD * Updated root-config buildconfig * Revert to default to dev * Updated prod deploy to also tag the microfrontends * srcr updated for nir bundle * fix for final approval by sdm * srcr with changes for nir bundle * updates to workflows * formatted nir json * added postgres generated files to gitignore * Added validity checks to lat long minutes and seconds * Added support for decimals * bug fixes * nom bundling changes * updated file format * update name and path * changes to remove submit button (#459) * Added lat long to cssa form for bundling and standalone applications * changes for srcr individual flow * updated variable name * updated form by deleting a button * updating site owner role in bundling forms * changes for SRCR individual form workflow * removing as its not used * fixed nom form * fixed nom & Cssa form * changes for validation * fix for issues 306 and 307 * fix for issue 309 (#468) * issue fix for 315 (#469) * srcr fix (#471) --------- Co-authored-by: jaise-aot <[email protected]> Co-authored-by: midhun-aot <[email protected]> Co-authored-by: midhun-aot <[email protected]> Co-authored-by: acoard-aot <[email protected]> Co-authored-by: RyanBirtch-aot <[email protected]>
sakthi-aot
approved these changes
Aug 31, 2023
|
Kudos, SonarCloud Quality Gate passed!
|
jaise-aot
added a commit
that referenced
this pull request
Dec 29, 2023
* revert nir format changes * nir bundle changes * email id issue fix * issue fix for 294 * site owner actions displayed on resubmit * issue fix for 296 * issue fix for 295 * workflow updates for nir bundle * changes to NIR bundle form * add formsflow-client-reviewer check before display notes section * Updated root config CI/CD (EPDDS-270) (#454) * Updated root config CI/CD * Updated root-config buildconfig * Revert to default to dev * Updated prod deploy to also tag the microfrontends * srcr updated for nir bundle * fix for final approval by sdm * srcr with changes for nir bundle * updates to workflows * formatted nir json * added postgres generated files to gitignore * Added validity checks to lat long minutes and seconds * Added support for decimals * bug fixes * nom bundling changes * updated file format * update name and path * changes to remove submit button (#459) * Added lat long to cssa form for bundling and standalone applications * changes for srcr individual flow * updated variable name * updated form by deleting a button * updating site owner role in bundling forms * changes for SRCR individual form workflow * removing as its not used * fixed nom form * fixed nom & Cssa form * changes for validation * fix for issues 306 and 307 * fix for issue 309 (#468) * issue fix for 315 (#469) * srcr fix (#471) --------- Co-authored-by: jaise-aot <[email protected]> Co-authored-by: midhun-aot <[email protected]> Co-authored-by: midhun-aot <[email protected]> Co-authored-by: acoard-aot <[email protected]> Co-authored-by: RyanBirtch-aot <[email protected]>
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.