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

resolving conflicts for dev to main merge #478

Merged
merged 5 commits into from
Aug 31, 2023
Merged

resolving conflicts for dev to main merge #478

merged 5 commits into from
Aug 31, 2023

Commits on Aug 10, 2023

  1. Merge pull request #439 from bcgov/dev

    merging dev to main for deployment
    nikhila-aot authored Aug 10, 2023
    Configuration menu
    Copy the full SHA
    6daf063 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Merge pull request #446 from bcgov/dev

    Dev to main pull request for 10Aug 2023 release
    nikhila-aot authored Aug 11, 2023
    Configuration menu
    Copy the full SHA
    e1ba439 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Merge pull request #449 from bcgov/dev

    merging for Sds deployment on 11 Aug 2023
    nikhila-aot authored Aug 14, 2023
    Configuration menu
    Copy the full SHA
    e14e7ff View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. 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]>
    6 people authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    e480dcb View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. resolved conflicts

    nikhila-aot committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    77932af View commit details
    Browse the repository at this point in the history