pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,391 Commits 1 Branch 0 Tags
Commit Graph

5391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dandds
bd8a469e93 Fix tests that were broken by a fixture CRL expiring. 
Adjust the broken tests to use our dynamic fixtures for PKI files. Some
tests still rely on these fixtures, but this is a minimal patch to get
the test suite passing again. Eventually all tests should use the pytest
fixtures.
 2019-07-10 11:11:49 -04:00
dandds
b081833be9
Merge pull request #951 from dod-ccpo/bump-python 
Upgrade Python to 3.7.3 and add PyYAML.
 2019-06-20 16:31:55 -04:00
dandds
f114852523
Merge pull request #955 from dod-ccpo/fix-member-form-alignment-chrome 
Fix app member checkbox alignment in Chrome
 2019-06-20 15:50:06 -04:00
dandds
8edb678bf8
Merge pull request #954 from dod-ccpo/fix-landing-page-alignment-again 
Actually center portfolio landing page content
 2019-06-20 15:49:39 -04:00
leigh-mil
78236e9e55
Merge pull request #957 from dod-ccpo/ie11-to-bug 
Fix IE11 Bug
 2019-06-20 14:53:01 -04:00
leigh-mil
6d1d621e02
Merge pull request #922 from dod-ccpo/remove-skipped-tests 
Delete unneeded tests
 2019-06-20 14:52:47 -04:00
leigh-mil
2ea0efb60a Update test 2019-06-20 14:38:55 -04:00
leigh-mil
a0f6d98d28 Remove more unnecesary tests 2019-06-20 14:28:56 -04:00
leigh-mil
f76d67dddb update comment 2019-06-20 14:28:56 -04:00
leigh-mil
c1383e1ec7 Delete unneeded tests 2019-06-20 14:28:56 -04:00
leigh-mil
cb6550abe6 pass 0 when value is None 2019-06-20 13:39:14 -04:00
leigh-mil
de7097e55b
Merge pull request #953 from dod-ccpo/add-to-button-perms 
TO bug fixes
 2019-06-20 11:58:51 -04:00
richard-dds
de5d9ddbcc Actually center portfolio landing page content 2019-06-20 11:19:47 -04:00
richard-dds
2d2b241d38 Fix app member checkbox alignment in Chrome 2019-06-20 11:09:59 -04:00
leigh-mil
2ddc4c2c2b
Merge pull request #952 from dod-ccpo/translations-edit-to 
Use translations
 2019-06-20 11:07:36 -04:00
leigh-mil
7545bb48a9 Make funding icon blue when viewing TO form 2019-06-20 11:03:33 -04:00
leigh-mil
a3a62b39fd Add check for user perms to show add TO button 2019-06-20 11:00:43 -04:00
leigh-mil
9278a251cc Use translations in edit TO form and update PDF upload size limit 2019-06-20 10:50:23 -04:00
dandds
7814173d72
Merge pull request #950 from dod-ccpo/squash-migrations2 
Squash the migrations into one reset.
 2019-06-20 10:08:34 -04:00
dandds
6abbf4bac0 Upgrade Python to 3.7.3 and add PyYAML. 
We should try and track mainline Python as much as possible.

PyYAML was a sub-dependency of a dev dependency but was being included
in the translations utility. Bundling only the production Python
dependencies was not working because of this.
 2019-06-20 06:26:08 -04:00
dandds
45818106c9 Squash the migrations into one reset. 
This required destroying the database. The existing migrations are not
worthwhile history, though, and are available in the git history if
needed.
 2019-06-19 15:29:31 -04:00
dandds
9c2b9c6da6
Merge pull request #949 from dod-ccpo/no-test-code-in-prod 
Do not use test functions in production code
 2019-06-19 15:18:39 -04:00
dandds
9945f774e6 Do not use test functions in production code 2019-06-19 15:08:53 -04:00
George Drummond
378a0ea2bd
Merge pull request #943 from dod-ccpo/remove-confirmation-popover 
Remove confirmation-popover
 2019-06-19 13:24:04 -04:00
dandds
f46d1f80af
Merge pull request #948 from dod-ccpo/non-unique-to 
Do not enforce TO number uniqueness.
 2019-06-19 13:19:21 -04:00
dandds
7f469bcd89
Merge pull request #947 from dod-ccpo/task-order-save 
Redirect user to TO edit page when they save incomplete state.
 2019-06-19 13:13:03 -04:00
dandds
f793973da4 Do not enforce TO number uniqueness. 
We don't know for a fact that TO number uniqueness is a requirement at
the database level. For now, remove the unique constraint so that users
can enter redundant TOs.
 2019-06-19 13:03:41 -04:00
dandds
0fbc2ea270 Redirect user to TO edit page when they save incomplete state. 2019-06-19 12:10:48 -04:00
dandds
c60baf0709
Merge pull request #944 from dod-ccpo/app-settings-bug 
Some environments might not have associated users.
 2019-06-19 11:25:11 -04:00
montana-mil
a719fef078
Merge pull request #946 from dod-ccpo/fix-obligated-amount-NaN-bug 
Fix Obligated Amount Masking Issues
 2019-06-19 10:57:54 -04:00
dandds
37216d33ae
Merge pull request #945 from dod-ccpo/dont-show-deleted-portfolios 
Do not return deactivated portfolios in Portfolios.for_user
 2019-06-19 10:44:33 -04:00
montana
f291e9344d Do not show initial masking 2019-06-19 10:42:25 -04:00
montana
d80d8210f9 Handle NaN in obligated amount input properly 
- there is some hackiness to the text input portion
 2019-06-19 10:42:17 -04:00
dandds
94d8680361 Do not return deactivated portfolios in Portfolios.for_user 2019-06-19 10:39:42 -04:00
dandds
3c5df7b1aa Some environments might not have associated users. 
There was a bug in the application settings route that threw an error if
an environment role and its associated application role did not have an
associated user. Updated to check for the user name on the application role.
 2019-06-19 10:12:01 -04:00
George Drummond
9bf06ad5e2
Delete RequiredLabel 2019-06-19 09:48:46 -04:00
dandds
a91d438d1c
Merge pull request #942 from dod-ccpo/to-form-fixes 
TO Form fixes
 2019-06-18 14:41:54 -04:00
montana-mil
4c65c58bd1
Merge pull request #941 from dod-ccpo/long-totals-box 
Fix Totals Box display on IE11
 2019-06-18 14:41:03 -04:00
George Drummond
ded7ffff18
Merge pull request #932 from dod-ccpo/to-save-as-draft 
Allow saving TO as draft
 2019-06-18 14:33:08 -04:00
George Drummond
929ad8648b
Remove confirmation-popover 2019-06-18 14:32:25 -04:00
George Drummond
d672f5792c
Save as draft 2019-06-18 14:11:55 -04:00
leigh-mil
f1b2825ab5 Update Totals box text and use translations 2019-06-18 13:57:00 -04:00
leigh-mil
c91ad961a2 Cancel button always goes to portfolio funding page 2019-06-18 13:39:18 -04:00
dandds
c0da5d482f
Merge pull request #940 from dod-ccpo/display-clin-type 
Fix CLIN type display
 2019-06-18 11:44:36 -04:00
dandds
c4d8067f45 Fixes a bug where the CLIN type was not displaying correctly for saved 
TOs.

The enum for the CLIN type needs to be coerced in the form data so that
the `jedi_clin_field` data is the value of the enum option. Perviously
the `jedi_clin_field` was being populated with a stringified
representation of the enum, like `JEDICLINType.JEDI_CLIN_1`.
 2019-06-18 11:33:41 -04:00
montana
b0130b04ef Use display: table instead of height: fit-content 2019-06-18 11:26:22 -04:00
leigh-mil
632cd82398
Merge pull request #938 from dod-ccpo/clear-checkbox 
Clear checkbox on TO signature modal when it is closed
 2019-06-18 09:38:17 -04:00
leigh-mil
8fea19b18d
Merge pull request #939 from dod-ccpo/fix-home-page-icons 
Fix home page icons
 2019-06-17 18:36:58 -04:00
leigh-mil
1aab857a1e set value of checkbox to false when modal closes 2019-06-17 18:31:39 -04:00
dandds
71340fd039
Merge pull request #937 from dod-ccpo/to-submit-modal-overflowing 
Give the label a max width to prevent text overflow in ie and edge
 2019-06-17 17:24:48 -04:00