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

6794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leigh-mil
4d2a175136 Use generalized macro for new member form in application settings 2020-01-10 10:25:55 -05:00
leigh-mil
6e50a8cc1f Generalize macro for adding new member to an application or portfolio 2020-01-10 10:25:55 -05:00
leigh-mil
ff3e585dfe Initial formatting and styling of portfolio managers table. Deleted unused css 2020-01-10 10:25:55 -05:00
dandds
8fc543928d
Merge pull request #1299 from dod-ccpo/pki-cruft 
Clean up unused PKI test files.
 2020-01-10 10:19:56 -05:00
dandds
c2ea17b8d1 Clean up unused PKI test files. 
Previously these files were being used to integration testing of mutual
TLS authentication. They're not any longer and can be removed.
 2020-01-10 09:44:57 -05:00
leigh-mil
7f13643ff7
Merge pull request #1301 from dod-ccpo/to-builder-summary-items 
TO Builder Step 4 bugfixes
 2020-01-09 13:55:29 -05:00
leigh-mil
ca409cae6c Display TO number on Step 4 of TO builder 2020-01-09 10:50:10 -05:00
leigh-mil
34cb9daca6 Only fake expended funds if the TO is active 2020-01-09 10:37:54 -05:00
leigh-mil
0bf0e9dcb2 Remove unnecessary if statement that was preventing TO total value from being displayed. 2020-01-09 10:36:27 -05:00
graham-dds
29194a83e1
Merge pull request #1296 from dod-ccpo/bugfix/clin-title-xss 
Remove an XSS vulnerability in CLIN title form input
 2020-01-08 14:07:48 -05:00
graham-dds
c02bb8518e Escape html chanacters, if any, in CLIN number 2020-01-08 11:10:59 -05:00
graham-dds
eaa6b33b8e Add js lib function for escaping HTML 2020-01-08 11:10:59 -05:00
leigh-mil
b1d4d62533
Merge pull request #1288 from dod-ccpo/portfolio-admin-styling 
Update styling on portfolio admin page
 2020-01-08 10:50:42 -05:00
leigh-mil
db264696e7
Merge branch 'staging' into portfolio-admin-styling 2020-01-08 10:10:31 -05:00
dandds
821196e101
Merge pull request #1295 from robgil-dds/testing-k8s-iam 
k8s IAM changes for keyvault access
 2020-01-08 06:23:12 -05:00
Rob Gil
11404a6e5b Adds IAM roles for the Managed Identity Module 
This adds the ability to pass in a list of roles to be assigned to the
managed identity user.
 2020-01-07 14:00:27 -05:00
dandds
016f47f979
Merge pull request #1293 from dod-ccpo/nginx-redirects 
Update NGINX config to use supplied domains.
 2020-01-07 09:59:33 -05:00
dandds
51f7afd5b0 Update NGINX config to use supplied domains. 
I left the domains hard-coded for the redirects in our NGINX config,
which was breaking authentication for versions of the site that don't
use that domain. This updates the config to use the domains supplied via
environment variable.
 2020-01-07 06:12:56 -05:00
Rob Gil
f76934eaaf Adds initial OpenVPN configuration docs and powershell instructions 2020-01-06 19:45:46 -05:00
Rob Gil
a5ea2e3757 Testing k8s config 2020-01-06 18:21:48 -05:00
leigh-mil
667554dba4 Update styling on portfolio admin page, update portfolio form to include description 2020-01-06 15:55:07 -05:00
leigh-mil
86913ec738
Merge pull request #1287 from dod-ccpo/portfolio-defense-component-bug 
Portfolio defense component bug
 2020-01-06 15:53:36 -05:00
leigh-mil
64d9b8042e
Merge branch 'staging' into portfolio-defense-component-bug 2020-01-06 15:16:25 -05:00
graham-dds
c04c767219
Merge pull request #1282 from dod-ccpo/tidy-sidenav-and-topbar 
Tidy sidenav and topbar
 2020-01-06 15:11:09 -05:00
leigh-mil
da26273eb2
Merge branch 'staging' into portfolio-defense-component-bug 2020-01-06 14:58:48 -05:00
graham-dds
aba9c4facb Tidy topbar 2020-01-06 14:51:52 -05:00
graham-dds
cdd4a4eee1 Tidy sidenav 2020-01-06 14:51:52 -05:00
dandds
903edb8068
Merge pull request #1292 from dod-ccpo/session-cookie-domain 
Config to specify session cookie domain.
 2020-01-06 14:25:05 -05:00
dandds
60b12fca52 Config to specify session cookie domain. 
This got lost somewhere along the way (almost certainly by me), so this
commit tries to make it explicit. The app needs to be able to configure
the session cookie domain name so that it is valid for both the main
site domain and the authentication subdomain. For instance, if the site
is runnning at uat.atat.code.mil and authentication happens at
auth-uat.atat.code.mil, SESSION_COOKIE_DOMAIN should be set to
atat.code.mil so that it's valid for both.

This adds the setting to the base INI file and a default for our K8s
clusters.
 2020-01-06 14:07:53 -05:00
leigh-mil
e77b69dc41
Merge pull request #1290 from dod-ccpo/to-fixes 
Fix translations
 2020-01-06 13:31:52 -05:00
leigh-mil
59a7ef91b3
Merge branch 'staging' into to-fixes 2020-01-06 13:14:39 -05:00
leigh-mil
8710028256 Fix factories and seed sample script 
Update display of defense component on portfolio settings page
 2020-01-06 13:08:57 -05:00
leigh-mil
dad54ec139 Create new migration to convert column type of defense_component from 
string to array
 2020-01-06 13:08:56 -05:00
graham-dds
d0fd7126be
Merge pull request #1286 from dod-ccpo/bugfix/inclusive-pop-dates 
Bugfix - Inclusive pop dates
 2020-01-06 13:00:09 -05:00
graham-dds
46ed1f0e71 Remove / refactor TO class properties 
This commit removes properties that weren't be used anywhere in the code
 base. It also refactors two properties to use sum() with a generator
comprehension instead of a for loop.
 2020-01-06 12:29:59 -05:00
graham-dds
aabedbcac4 Make PoP start and end dates inclusive. 
Also removes the clock class.

Makes PoP date ranges inclusive such that a task order with:
-  a start date on or after the current date
and
- an end date on or before the current date
should be considered valid.

This commit also removes the Clock class. This class had two methods as
shortcuts for common uses of pendlum functions. But it wasn't being used
in very many places, and it took up about the same space as

    from pendulum import today()
    ...
    today(tz="UTC").date()

If we want to add this back in, it might be a good idea to extend it for
other time functions we have sprinkled around, like the random date
functions in our tests
 2020-01-06 12:29:59 -05:00
leigh-mil
3ded9f3f89
Merge branch 'staging' into to-fixes 2020-01-06 12:23:24 -05:00
graham-dds
f4e1b668f2
Merge pull request #1281 from dod-ccpo/bugfix/reporting-apps-and-envs 
Better incorporate fixture data into reporting
 2020-01-06 12:23:08 -05:00
graham-dds
490d778743 Better incorporate fixture data into reporting 
Before this commit, if a portfolio wasn't present in the spending fixture
data, the reporting screen would be empty -- even if the portfolio had
applications and environments associated with it on the database. Now,
0s appear if an application and / or environment isn't present in the
fixture data.
 2020-01-06 12:01:13 -05:00
leigh-mil
df74095f6a Fix translations used in reporting page and TO view/review page 2020-01-03 13:36:13 -05:00
leigh-mil
2cb2b48bba
Merge pull request #1289 from dod-ccpo/to-view-styling-fix 
TO view fix
 2020-01-02 16:19:49 -05:00
leigh-mil
f4f0665643 Fix styling so that no border on last row only applies to clin summary table 2020-01-02 16:05:09 -05:00
leigh-mil
b157daeff9
Merge pull request #1275 from dod-ccpo/to-view-review-pages 
To view review pages
 2020-01-02 14:14:36 -05:00
leigh-mil
ee2aa4bda9 Generalize class name to better reflect its use. 2020-01-02 12:57:21 -05:00
leigh-mil
dcd0f4f6ae Remove unnecessary comment 2020-01-02 12:47:31 -05:00
leigh-mil
e25f519243 Change TO fragment to a macro to make it reusable in the builder and view page, final tweaks to review and view pages 2020-01-02 12:45:53 -05:00
leigh-mil
2e088d1316 Rename view TO file and update sticky header 2020-01-02 12:45:52 -05:00
leigh-mil
8ece47627e Initial styling and layout of TO view fragment 2020-01-02 12:45:52 -05:00
leigh-mil
cbcac2b142 Rename review route and template to view because it better reflects the purpose of the route and template 2020-01-02 12:45:52 -05:00
dandds
2f7a974955
Merge pull request #1285 from robgil-dds/170237476-autoscaling-fix 
170237476 - Autoscaling fix
 2020-01-02 12:02:43 -05:00