Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Enterprise-CMCS/eAPD
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v.4.5.1
Choose a base ref
...
head repository: Enterprise-CMCS/eAPD
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.6
Choose a head ref
  • 18 commits
  • 291 files changed
  • 6 contributors

Commits on Aug 9, 2022

  1. Copy the full SHA
    7ea764e View commit details

Commits on Aug 11, 2022

  1. Fix Weekly AMI Scan (#4269)

    * Attempt to send ENTER to command
    
    * Updating storing of Packer repo key
    
    * Reverting to old key method
    
    * Changing method for sending ENTER to add repo command
    
    * Adding tealium tags to Packer Preview build
    
    * Fixing formatting
    
    * Adding schedule back in
    cthulhuplus authored Aug 11, 2022
    Copy the full SHA
    b02ddb8 View commit details

Commits on Aug 15, 2022

  1. bbrooks/3127-Atlantis (#4197)

    * Adding test file for testing
    
    * Removing test file for testing
    
    * Created test file
    
    * Testing Atlantis
    
    * Testing Atlantis
    
    * Removing test comment
    
    * Return of the testing comment
    
    * Longer testing comment
    
    * Removal of testing comment
    
    * Triggering Atlantis
    
    * Triggering Atlantis
    
    * Triggering Atlantis
    
    * Triggering Atlantis
    
    * Rereturn of the testing comment
    
    * Added creds to atlantis backend
    
    * Attempt to get Atlantis to get public.tfvars file
    
    * Terraform file update to test Atlantis
    
    * Testing Atlantis
    
    * Attempting to update GitHub
    
    * Updating Terraform to support TB jumpbox
    
    * Updating comment to try and trigger Atlantis
    
    * Test
    
    * Test
    
    * Added var-file-allowlist to atlantis server config
    
    * Different var file config
    
    * Updated Atlantis config file
    
    * Please see the tfvars file
    
    * Updating test comment
    
    * Fixed typo in Atlantis config
    
    * Add a g to the comment
    
    * Fixed another typo
    
    * Testing
    
    * Moved tfvar file
    
    * Moved tfvar file
    
    * Moved tfvar file
    
    * Renaming tfvar in atlantis config
    
    * Trigger CI
    
    * Increase OWASP timeout
    
    * Reverting timeout and adding a new one
    
    * Adding vulnerability scan fix
    
    * Updating comment to trigger Atlantis
    
    * Updating comment to trigger Atlantis
    
    * Updating comment to trigger Atlantis
    
    * Removing testing comment
    cthulhuplus authored Aug 15, 2022
    Copy the full SHA
    6efccb9 View commit details

Commits on Aug 18, 2022

  1. Copy the full SHA
    21cc920 View commit details

Commits on Aug 22, 2022

  1. Copy the full SHA
    89f0044 View commit details

Commits on Aug 23, 2022

  1. Adding Babel to API (#4263)

    thetif authored Aug 23, 2022
    Copy the full SHA
    c5588a4 View commit details

Commits on Aug 24, 2022

  1. Copy the full SHA
    6b41379 View commit details
  2. Copy the full SHA
    f399dea View commit details

Commits on Aug 30, 2022

  1. bbrooks/3927-Direct-to-Staging (#4282)

    * Attempting to deploy directly to staging
    
    * Adding rc tag trigger to a couple more jobs/workflows
    
    * Trigger CI
    
    * Adding additional prerequists
    
    * Trigger CICD
    cthulhuplus authored Aug 30, 2022
    Copy the full SHA
    bbf3a36 View commit details
  2. Copy the full SHA
    16beede View commit details
  3. Copy the full SHA
    cc0ba35 View commit details
  4. Copy the full SHA
    a98ac7b View commit details

Commits on Aug 31, 2022

  1. Nz/3354 cost allocation validation (#4186)

    * updates schema
    
    * Joi alternatives
    
    * number field changes
    
    * Validating correctly -- need errors
    
    * Add support and doesNotSupport erros
    
    * updated NumberField
    
    * merged with main; updated templates; turned chromatic back on
    
    * pita
    
    * Nz/3867 keystate form joi (#3941)
    
    * Email error added
    
    * Cost with benefits error
    
    * Progress on form
    
    * hasCost boolean
    
    * Reset fields
    
    * Got cost & price to save and reload
    
    * Save costs and fte with total
    
    * Test progress
    
    * Update circle
    
    * Test progress
    
    * Fix hasCosts Update reducer
    
    * Update basics test
    
    * Fix linting
    
    * Update form
    
    * Mock setFormValid
    
    * Update test
    
    * Update basics
    
    * Updating test data
    
    * Update executive summary test
    
    * Update yarn lock
    
    * updated cypress tests with new key state personnel
    
    * Update error messages
    
    * Add schema
    
    * Delete commented out code and fix error message
    
    * Remove console log
    
    * Update tests
    
    * Fix e2e
    
    Co-authored-by: Darren Mirano <dmirano@fearless.tech>
    
    * push up
    
    * Update tests
    
    * updated to datefield
    
    * updates to datefield
    
    * fixes merge issues
    
    * updated tests
    
    * fixed broken e2e test
    
    * adding my key
    
    * minor fixes
    
    * Update DateField.js
    
    * resolve tests
    
    * upgrade node version to 16.15.0, upgrade yarn to 1.22.18, changed docker image to node:16.15.0-alpine3.15, upgraded cypress to 9.6.0
    
    * fix cypress cost summary
    
    * updated snapshot
    
    * Update yarns
    
    * adds back copy-schemas
    
    * update package.json and yarn.lock to match 3499
    
    * updates yarn.lock to match 3499
    
    * Update branch
    
    * Name funding source reset
    
    * Update Name and Funding Source
    
    * Remove console log
    
    * Test name and activity type
    
    * Update
    
    * planned start end dates
    
    * test for dates
    
    * updated PR template to remind everyone to use labels in the PRs
    
    * Fix tests
    
    * linting issues
    
    * Remove resetFieldErrors
    
    * Lint fixing
    
    * Update json
    
    * Remove unused variable
    
    * Remove description
    
    * updates paths
    
    * remove unused dep
    
    * remove unused dep
    
    * updates DateField to new pattern
    
    * Update jest tests
    
    * Linting fix
    
    * fix form
    
    * Fix lint
    
    * Update for lint
    
    * Romve duplicat
    
    * Romve duplicat
    
    * fix seed
    
    * Update
    
    * Reset StandardsAnd Conditions
    
    * json research
    
    * Fix linting and test issueS
    
    * Remove commented out code
    
    * Update JSON
    
    * Remove description
    
    * Revert "Remove description"
    
    This reverts commit be55fea.
    
    * Revert "Update JSON"
    
    This reverts commit aa7f10e.
    
    * Revert "fix form"
    
    This reverts commit d3946c1.
    
    * Revert Milestone Form
    
    * add summary
    
    * Switch summary and description
    
    * Update
    
    * Update
    
    * Remove test
    
    * Merge w/ main
    
    * Comment
    
    * Readd Overview test
    
    * Fix ref liont
    
    * Update Standards and Conditions
    
    * Update lock files
    
    * Fix linting errors
    
    * Fix lint
    
    * Update seeds
    
    * Update snapshot
    
    * Remove ForwardRef
    
    * Remove ForwardRef
    
    * Remove forwardRef
    
    * Update try to useEffect
    
    * Update overview
    
    * Overview render test pass
    
    * Fix linting
    
    * Update config
    
    * Add no time
    
    * Update config
    
    * Update config
    
    * Adding COMPOSE_HTTP_TIMEOUT to increase timeout
    
    * Adding -d flag back to docker-compose command
    
    * Switching back to just -d
    
    * Reverting compose change
    
    * Update config.yml
    
    * updated cypress version
    
    * removed root package
    
    * added command to build before composing e2e tests
    
    * adding timeout for docker-compose
    
    * added timeouts to e2e
    
    * updated sharp version
    
    * Tif updates (#4057)
    
    * Fix linting
    
    * add admin check toggle
    
    * Update package.lock
    
    * Overview main fix
    
    * remove toggleAdmin
    
    * Update overview validation
    
    * Update tests
    
    * Remove message
    
    * Fix linting
    
    * change adminCheck value
    
    * Update config.yml
    
    * Update apd.js
    
    * Update config.yml
    
    * update snapshots
    
    * Add trigger onChange
    
    * Update conditional trigger
    
    * fix defaults
    
    * Fix test
    
    * Update admin lint
    
    * Update dockerfiles to run on M1 computers
    
    * Update date validation
    
    * Fix lint
    
    * removed local error messages from datefield
    
    * Update schema
    
    * Allow blank string for end date
    
    * remove liine
    
    * Init
    
    * Methodology required
    
    * add admincheck
    
    * CostAllocation reset
    
    * Require methodology
    
    * Get other sources to show error
    
    * Stash
    
    * Trying to get other source
    
    * wip
    
    * wip
    
    * wip
    
    * Progress
    
    * In progress
    
    * Schema for otherSources
    
    * wip
    
    * Get other sources error to show
    
    * Reset other funding
    
    * Move costallocation schema
    
    * Update jest tests
    
    * Hardcode validation
    
    * massage data
    
    * Update conditional
    
    * Update test
    
    * Update snapshot
    
    * Update snaps shots
    
    * Update lint
    
    * update CostAllocate
    
    * Update jest test
    
    * Update jest test
    
    * fix e2e
    
    * fix dependency
    
    * Add glob-parent to allow list
    
    * Update jest tests
    
    * PR notes
    
    * audit-ci edit
    
    * Update error message
    
    * Fix error msg
    
    * wip
    
    * update yarn
    
    * update incentive
    
    * remove lint
    
    * fix adminCheck reducer default
    
    * update tests
    
    * update yarn
    
    * update yarn
    
    * update yarn
    
    * update ci-audit
    
    * update yarn lock
    
    * update audit ci
    
    * fix test cookie
    
    * update yarn
    
    * update snapshots
    
    Co-authored-by: Ty Bolt <tybolt@gmail.com>
    Co-authored-by: Tiffany Forkner <thetif@gmail.com>
    Co-authored-by: Darren Mirano <dmirano@fearless.tech>
    Co-authored-by: cthulhuplus <brookswm@gmail.com>
    5 people authored Aug 31, 2022
    Copy the full SHA
    d9d4ad2 View commit details
  2. Dmirano/4238 cypress budget checks (#4284)

    * started budget check tests
    
    * budget test progress
    
    * cypress budget tests WIP
    
    * state staff budget progress
    
    * checks state staff budget for each ffp type
    
    * budget check progress
    
    * finished budget tests with fed-state split and added to circle config
    
    * fixed typo
    
    * made requested changes
    
    * added comments for forEach -> for loop
    mirano-darren authored Aug 31, 2022
    Copy the full SHA
    f8cdaf5 View commit details
  3. Copy the full SHA
    7f6c146 View commit details

Commits on Sep 1, 2022

  1. Copy the full SHA
    9793115 View commit details

Commits on Sep 2, 2022

  1. Nz/validate incentive payment (#4273)

    * set up adminCheck
    
    * table cell error
    
    * add check for NaN
    
    * update jest tests
    
    * update for linting
    
    * move schema to common
    
    * remove console.logs
    
    * test progress
    
    * test refactor
    
    * Update tests
    
    * fix lint
    
    * remove lint
    
    * update yarn
    
    * update audit-ci
    
    * change error message
    
    * update yarn scripts
    
    * update incentive payment
    
    * replace error message
    
    * Update error msg
    
    * update schema placement
    
    Co-authored-by: Tiffany <thetif@gmail.com>
    Nicole Zonnenberg and thetif authored Sep 2, 2022
    Copy the full SHA
    fb20bcf View commit details
  2. Copy the full SHA
    cf3acf8 View commit details
Loading