7342 Commits

Author SHA1 Message Date
leigh-mil
4802880cdb Prevent double submitting in multi-step forms by updating the submitted property in handleSubmit 2020-02-13 10:44:38 -05:00
leigh-mil
4fb8d37746
Merge pull request #1422 from dod-ccpo/reupload-files
Enable re-uploading files after an error
2020-02-13 10:43:51 -05:00
leigh-mil
f5437b40b8
Merge branch 'staging' into reupload-files 2020-02-13 10:22:16 -05:00
leigh-mil
839aa6829e
Merge pull request #1424 from dod-ccpo/highlight-portfolio-sidenav
Highlight portfolio name in sidenav
2020-02-12 15:01:11 -05:00
leigh-mil
5130d16064 Check the global portfolio to highlight the active portfolio.
Change arg name from other_portfolio to portfolio.
2020-02-12 14:07:40 -05:00
leigh-mil
4634477179 Enable reuploading files after an error 2020-02-12 13:36:51 -05:00
tomdds
787abcaf4e
Merge pull request #1419 from dod-ccpo/state-machine-complete-trigger
state machine last CREATED state transition to COMPLETED
2020-02-12 11:12:53 -05:00
tomdds
6f700cc07e
Merge branch 'staging' into state-machine-complete-trigger 2020-02-12 10:37:31 -05:00
graham-dds
ae0439afa3
Merge pull request #1418 from dod-ccpo/SPACE-FORCE
SPACE FORCE 🚀 (and other branches)
2020-02-12 10:07:52 -05:00
graham-dds
21aa515b60
Merge branch 'staging' into SPACE-FORCE 2020-02-12 09:49:10 -05:00
4569066024 state machine last CREATED state transition to COMPLETED 2020-02-12 09:31:52 -05:00
dandds
18c26a0c0e
Merge pull request #1406 from dod-ccpo/billing-owner
Create billing owner
2020-02-11 16:19:43 -05:00
dandds
285021de7c
Merge branch 'staging' into billing-owner 2020-02-11 16:01:27 -05:00
dandds
ceb8cdc198 update state machine enum 2020-02-11 15:18:45 -05:00
graham-dds
f8433fb7ef Add branches that are not space force 2020-02-11 15:14:57 -05:00
graham-dds
099e95c7e3 SPACE FORCE 🚀 2020-02-11 15:09:23 -05:00
graham-dds
bad916dfb0
Merge pull request #1416 from dod-ccpo/reporting-integration
Bugfix: Accurately report Total Portfolio Value
2020-02-11 14:53:16 -05:00
dandds
facaae5cb1 Merge branch 'staging' into billing-owner 2020-02-11 14:50:11 -05:00
graham-dds
321b0a9cd4 Fix upcoming TO PoP bug in seed_sample
Some kwargs were in the wrong places
2020-02-11 14:27:30 -05:00
graham-dds
68e7c27aed portfolio value should include upcoming $obligated
Previously, we were displaying the total_portfolio_value as just
currently obligated funds. Instead, this value should be obligated funds
in current task orders and signed, upcoming task orders
2020-02-11 14:27:29 -05:00
graham-dds
e553a673b1 Tests for total_obligated_funds portfolio prop 2020-02-11 14:27:29 -05:00
graham-dds
52489b6bca Add upcoming_obligated_funds property to portfolio 2020-02-11 14:27:29 -05:00
leigh-mil
c47c6d57eb
Merge pull request #1409 from dod-ccpo/find-dod-text
DoD help text
2020-02-11 14:23:02 -05:00
leigh-mil
d807b74175
Merge branch 'staging' into find-dod-text 2020-02-11 14:04:23 -05:00
tomdds
dffca12213
Merge pull request #1400 from dod-ccpo/portfolio-data-as-dict
class method to export portfolio data as dictionary as an arg to stat…
2020-02-11 14:03:28 -05:00
leigh-mil
cb4bcc593b Use .icon-tooltip--tight across the site instead of element specific classes 2020-02-11 14:01:25 -05:00
leigh-mil
e4e6c4d277 Add DoD ID tooltip to app member and portfolio member forms 2020-02-11 14:01:25 -05:00
tomdds
6079e01fb0 Ensure non-none value for csp_data state machine arg 2020-02-11 13:23:11 -05:00
tomdds
91d3795a92 Fix formatting issue 2020-02-11 13:21:53 -05:00
tomdds
2ed5c5b588
Merge branch 'staging' into portfolio-data-as-dict 2020-02-11 13:17:18 -05:00
dandds
aa35ef795b
Merge pull request #1393 from dod-ccpo/environment-role-creation
Environment role creation
2020-02-11 13:15:57 -05:00
dandds
10014e696d Merge branch 'staging' into environment-role-creation 2020-02-11 12:12:45 -05:00
tomdds
d1ee168270
Merge pull request #1387 from dod-ccpo/azure-initial-mgmt-grp
azure initial management group creation
2020-02-11 12:01:44 -05:00
tomdds
92bc848da5 Remove placeholder data in portfolio state machine test 2020-02-11 11:20:26 -05:00
tomdds
24414bc3a9 Fix DB migration conflict 2020-02-11 11:13:03 -05:00
tomdds
17b281b11a
Merge branch 'staging' into azure-initial-mgmt-grp 2020-02-11 11:06:28 -05:00
leigh-mil
8ee7cdc1cb
Merge pull request #1410 from dod-ccpo/fix-double-submit
Prevent double submitting in multi-step forms
2020-02-11 10:56:58 -05:00
leigh-mil
858312b2e0
Merge branch 'staging' into fix-double-submit 2020-02-11 10:31:53 -05:00
leigh-mil
935d44eaa2
Merge pull request #1407 from dod-ccpo/to-index-fixes
TO index page fixes
2020-02-11 10:31:01 -05:00
leigh-mil
7d867457fc
Merge branch 'staging' into to-index-fixes 2020-02-11 09:40:50 -05:00
dandds
49709cf8ea
Merge pull request #1413 from dod-ccpo/kombu-fix
Separate config for Celery BROKER_URL.
2020-02-11 09:20:56 -05:00
dandds
788f73b7a9 Separate config for Celery BROKER_URL.
I found out the hard way that, despite the Celery docs saying it will
respect settings of "none", "required", etc for the ssl_cert_reqs option
on ths broker connection uri, one it's underlying dependencies does not.
That dependency, Kombu, requires that the option be set as the string
version of one of the constants available on the standard library's ssl
module ("CERT_NONE", etc.). This fixes our code to supply slightly
variant connection URIs for Celery and for the session library. This
change can be reverted when Kombu is updated with the correct behavior.
2020-02-11 06:37:32 -05:00
dandds
a258bce84b
Merge pull request #1405 from dod-ccpo/dev-tenant
K8s dev config
2020-02-11 06:21:47 -05:00
dandds
93176073a9
Merge branch 'staging' into dev-tenant 2020-02-11 06:02:25 -05:00
leigh-mil
8522a786ce
Merge pull request #1398 from dod-ccpo/171115854-fix-sidenav
Fix sidenav
2020-02-10 19:56:38 -05:00
leigh-mil
b3d952c35d
Merge branch 'staging' into 171115854-fix-sidenav 2020-02-10 19:36:03 -05:00
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