generated from bcgov/quickstart-openshift
-
Notifications
You must be signed in to change notification settings - Fork 2
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 main merge conflicts #482
Merged
Merged
Commits on Aug 10, 2023
-
Merge pull request #439 from bcgov/dev
merging dev to main for deployment
Configuration menu - View commit details
-
Copy full SHA for 6daf063 - Browse repository at this point
Copy the full SHA 6daf063View commit details
Commits on Aug 11, 2023
-
Merge pull request #446 from bcgov/dev
Dev to main pull request for 10Aug 2023 release
Configuration menu - View commit details
-
Copy full SHA for e1ba439 - Browse repository at this point
Copy the full SHA e1ba439View commit details
Commits on Aug 14, 2023
-
Merge pull request #449 from bcgov/dev
merging for Sds deployment on 11 Aug 2023
Configuration menu - View commit details
-
Copy full SHA for e14e7ff - Browse repository at this point
Copy the full SHA e14e7ffView commit details
Commits on Aug 29, 2023
-
PROD Release for 5th Sept (#472)
* 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]>
Configuration menu - View commit details
-
Copy full SHA for e480dcb - Browse repository at this point
Copy the full SHA e480dcbView commit details
Commits on Aug 31, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 0248310 - Browse repository at this point
Copy the full SHA 0248310View commit details -
Configuration menu - View commit details
-
Copy full SHA for cb86f56 - Browse repository at this point
Copy the full SHA cb86f56View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2989731 - Browse repository at this point
Copy the full SHA 2989731View commit details
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.