7277 Commits

Author SHA1 Message Date
tomdds
ccbc61f34f
Merge branch 'staging' into azure-initial-mgmt-grp 2020-02-10 17:44:19 -05:00
tomdds
e225cfa551
Merge pull request #1411 from dod-ccpo/fix-kv-secret-update
Ensure credential updates properly merge values.
2020-02-10 17:36:14 -05:00
tomdds
6c0bc0dc47
Merge branch 'staging' into fix-kv-secret-update 2020-02-10 17:19:10 -05:00
dandds
9a05d64439
Merge pull request #1412 from dod-ccpo/redis-ssl-verify
Set Redis verification mode for TLS connections.
2020-02-10 17:18:24 -05:00
tomdds
0705b47e4d
Merge branch 'staging' into fix-kv-secret-update 2020-02-10 17:04:11 -05:00
dandds
f0ddc9b2aa
Merge branch 'staging' into redis-ssl-verify 2020-02-10 17:02:26 -05:00
dandds
f975249f07 Set Redis verification mode for TLS connections.
If the app is making a TLS connection to Redis, the new config setting
REDIS_SSLMODE determines whether CA verification should be performed.
Acceptable values are Python `None` or strings "none", "optional", and
"required".
2020-02-10 16:58:07 -05:00
graham-dds
f2be07ce42
Merge pull request #1396 from dod-ccpo/reporting-integration
Reporting integration - Use cloud data in reporting view
2020-02-10 16:20:04 -05:00
tomdds
e6d5369cb0 Ensure credential updates properly merge values.
Previously updating the credentials would delete values from the existing crednetials if they weren't also present in the update. This adds a method for merging credentials to the KeyVaultCredentials model and adds tests to both the cloud provider and model.
2020-02-10 16:14:42 -05:00
graham-dds
5b60a54dbc Remove fixture-based reporting methods
These methods probably can be reused to handle real Azure reporting data
2020-02-10 14:49:04 -05:00
graham-dds
4a78aa07c9 Remove non-MVP reporting elements
- Edits views to only show spending at the portfolio level -- no longer
  broken out by JEDI CLIN
- Removes Monthly Spending table -- keeps the template, just no longer
  uses it.
- Removes amount unspent from the expired funding table
2020-02-10 14:49:04 -05:00
graham-dds
63cb05249f Add Reports domain method to get portfolio spend 2020-02-10 14:49:04 -05:00
graham-dds
baa3f390d2 Extend graph width filter to handle 0/0 2020-02-10 14:49:04 -05:00
graham-dds
55736b723e Move calc of a portfolio's obligated funds to prop
Add a property on the portfolio model to calculate the total
obligated funds for a portfolio. This replaces a one-off calculation
in a view function, and sets up functionality for future access
2020-02-10 14:49:04 -05:00
graham-dds
2f1c57aef4 Add fn to prepare Azure reporting data for views 2020-02-10 14:49:04 -05:00
graham-dds
411d8a877c Add sample reporting data to mock cloud provider 2020-02-10 14:49:04 -05:00
graham-dds
5716e20b9e Edit query body to aggregate by month 2020-02-10 14:49:04 -05:00
leigh-mil
ec9da2d1c1
Merge pull request #1408 from dod-ccpo/to-number-text
Update TO number text to remove references to 13-digits
2020-02-10 14:48:24 -05:00
leigh-mil
4ee08c0c74
Merge branch 'staging' into to-number-text 2020-02-10 14:30:56 -05:00
leigh-mil
84e3e0603f
Merge pull request #1403 from dod-ccpo/app-settings-fixes
App settings fixes
2020-02-10 11:59:44 -05:00
leigh-mil
a6377b8d86 Update TO number text to remove references to 13-digits 2020-02-10 11:40:14 -05:00
leigh-mil
613b5513b3
Merge branch 'staging' into app-settings-fixes 2020-02-10 11:36:43 -05:00
Jay R. Newlin (PromptWorks)
adaa201f25
Merge pull request #1402 from dod-ccpo/gi-wo-20200202
Ghost Inspector test updates week of 2/2/2020
2020-02-10 11:28:58 -05:00
leigh-mil
72345c5ff4
Merge branch 'staging' into app-settings-fixes 2020-02-10 11:25:59 -05:00
Jay R. Newlin (PromptWorks)
f601a6cef4
Merge branch 'staging' into gi-wo-20200202 2020-02-10 11:11:28 -05:00
dandds
35e33f94c6
Merge pull request #1386 from dod-ccpo/move-tf
Move Terraform config to its own repo.
2020-02-09 16:45:25 -05:00
dandds
98d932c4dc Merge branch 'staging' into move-tf 2020-02-09 16:17:19 -05:00
dandds
c6cfb99dee
Merge pull request #1401 from dod-ccpo/ca-store
Update CAs in the container.
2020-02-07 15:57:53 -05:00
leigh-mil
a9d26d26e6 Prevent double submitting forms when Save buttons are double clicked 2020-02-07 14:28:44 -05:00
leigh-mil
ff98acdb1d Add prop for defaultVisible to the ToggleMenu vue component 2020-02-07 14:13:58 -05:00
Jay R. Newlin (PromptWorks)
12e1e3f95c Ghost Inspector test updates week of 2/2/2020 2020-02-07 13:42:14 -05:00
dandds
1ef0671158 Update CAs in the container.
In order for the app to make > TLS 1.2 connections to Redis, we need to
update the local certificate store in the container.
2020-02-07 12:48:44 -05:00
leigh-mil
da283e4615
Merge pull request #1397 from dod-ccpo/171114893-pdf-bug
PDF download bug
2020-02-07 09:30:33 -05:00
dandds
376774b6e8
Merge branch 'staging' into 171114893-pdf-bug 2020-02-07 08:31:49 -05:00
dandds
f297cd8c2f
Merge pull request #1399 from dod-ccpo/171142818-fix-portfolio-validations
Update portfolio and application validators
2020-02-07 08:29:53 -05:00
dandds
f4715fde95
Merge branch 'staging' into 171142818-fix-portfolio-validations 2020-02-07 06:46:24 -05:00
dandds
7e890345fe
Merge branch 'staging' into 171114893-pdf-bug 2020-02-07 06:29:22 -05:00
dandds
960351fa3a
Merge pull request #1395 from dod-ccpo/171009912-fix-spacing-on-forms
Fix spacing at the bottom of forms
2020-02-07 06:29:03 -05:00
dandds
21decca4e3
Merge branch 'staging' into 171114893-pdf-bug 2020-02-07 05:15:10 -05:00
dandds
ee9a8bc790
Merge branch 'staging' into 171009912-fix-spacing-on-forms 2020-02-07 05:11:47 -05:00
leigh-mil
9c460927e1
Merge pull request #1392 from dod-ccpo/170897424-fix-error-pages
Bugfix - 404 errors for non-existent pages
2020-02-06 19:19:25 -05:00
leigh-mil
589646fd90 Allow commas and quotes in portfolio and application names. Create input validator for application names. 2020-02-06 19:07:11 -05:00
leigh-mil
16342c2162
Merge branch 'staging' into 170897424-fix-error-pages 2020-02-06 17:50:51 -05:00
leigh-mil
644d86582e Save Attachment object_name when uploading PDFs in the TO builder 2020-02-06 17:34:56 -05:00
leigh-mil
39f8e4ce9c Fix generatte_download_link() -- Use BlockBlobService and BlobPermissions 2020-02-06 17:34:56 -05:00
leigh-mil
e744fddbf9
Merge pull request #1382 from dod-ccpo/add-celery-job-for-sending-tos
Add celery job for sending Task Orders
2020-02-06 16:11:35 -05:00
leigh-mil
c76ee1546d
Merge branch 'staging' into add-celery-job-for-sending-tos 2020-02-06 14:27:16 -05:00
leigh-mil
a76f61eb2a Check if view_args is not None to prevent KeyError 2020-02-06 14:08:30 -05:00
leigh-mil
a379074ebf add form class which adds margin-bottom to offset the action-group-footer height 2020-02-06 13:55:05 -05:00
leigh-mil
903f5ca33b Add todo about fixing tests 2020-02-06 13:07:46 -05:00